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/include/winuser32.h

    r10435 r21916  
    1212#include <dcdata.h>
    1313
     14#ifdef __cplusplus
     15extern "C" {
     16#endif
     17
    1418ULONG OSLibGetScreenHeight();
    1519ULONG OSLibGetScreenWidth();
    … …  
    2428LONG WIN32API clientHeight(HWND hwnd, pDCData pHps);
    2529int  WIN32API setMapModeDC(pDCData pHps, int mode);
     30
     31#ifdef __cplusplus
     32} // extern "C"
     33#endif
     34
     35#endif
     36
     37#ifdef __cplusplus
     38extern "C" {
    2639#endif
    2740
    … …  
    98111} POSTMSG_PACKET;
    99112
     113#ifdef __cplusplus
     114} // extern "C"
     115#endif
     116
    100117#endif //__WINUSER32_H__
Note: See TracChangeset for help on using the changeset viewer.