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/global.h

    r4 r21916  
    1818    int shmid;
    1919} SHMDATA;
     20
     21#ifdef __cplusplus
     22extern "C" {
     23#endif
    2024
    2125/* memory/global.c */
    … …  
    4549extern BOOL ATOM_Init( WORD globalTableSel );
    4650
     51#ifdef __cplusplus
     52} // extern "C"
     53#endif
     54
    4755#endif  /* __WINE_GLOBAL_H */
Note: See TracChangeset for help on using the changeset viewer.