Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/user32/oslibwin.h

    r10396 r21916  
    1515
    1616#ifdef __cplusplus
    17 #include <oslibgdi.h>
     17#include "oslibgdi.h"
    1818
    1919#ifndef WIN_INCLUDED
    … …  
    332332}
    333333
     334#ifdef __cplusplus
     335extern "C" {
     336#endif
     337
    334338ULONG OSLibGetScreenHeight();
    335339ULONG OSLibGetScreenWidth();
     340
     341#ifdef __cplusplus
     342} // extern "C"
     343#endif
    336344
    337345BOOL   OSLibWinLockWindowUpdate(HWND hwnd);
Note: See TracChangeset for help on using the changeset viewer.