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

    r7866 r21916  
    3333#include <stdlib.h>
    3434#include <string.h>
    35 //#include <oslibwin.h>
    36 #include <win32wnd.h>
     35//#include "oslibwin.h"
    3736#include <winuser.h>
     37#include "win32wnd.h"
    3838#include "initterm.h"
    3939
    … …  
    4343ODINDEBUGCHANNEL(USER32-WINEVENT)
    4444
     45extern "C" {
    4546
    4647/*****************************************************************************
    … …  
    8990  return 0;
    9091}
     92
     93} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.