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/win/monitor.h

    r1859 r21916  
    1010
    1111//#include "windef.h"
     12
     13#ifdef __cplusplus
     14extern "C" {
     15#endif
    1216
    1317struct tagMONITOR_DRIVER;
    … …  
    4650extern void MONITOR_SetScreenSaveTimeout(MONITOR *pMonitor, int nTimeout);
    4751
     52#ifdef __cplusplus
     53} // extern "C"
     54#endif
     55
    4856#endif /* __WINE_MONITOR_H */
    4957
Note: See TracChangeset for help on using the changeset viewer.