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/user32.cpp

    r10523 r21916  
    4646#include <stdlib.h>
    4747#include <string.h>
    48 //#include <oslibwin.h>
    49 #include <win32wnd.h>
     48//#include "oslibwin.h"
    5049#include <winuser.h>
     50#include "win32wnd.h"
    5151#include "initterm.h"
    5252
    … …  
    9090ODINDEBUGCHANNEL(USER32-USER32)
    9191
     92#ifdef __cplusplus
     93extern "C" {
     94#endif
    9295
    9396/* Coordinate Transformation */
    … …  
    22402243}
    22412244
    2242 
     2245#ifdef __cplusplus
     2246} // extern "C"
     2247#endif
Note: See TracChangeset for help on using the changeset viewer.