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

    r21510 r21916  
    33
    44#include "windef.h"
     5
     6#ifdef __cplusplus
     7extern "C" {
     8#endif
    59
    610#pragma pack(1)
    … …  
    166170typedef WORD PRINTEROP_FLAGS;
    167171
    168 typedef struct _SHNAMEMAPPINGW { 
    169     LPWSTR pszOldPath; 
    170     LPWSTR pszNewPath; 
    171     int   cchOldPath; 
    172     int   cchNewPath; 
    173 } SHNAMEMAPPINGW, *LPSHNAMEMAPPINGW; 
     172typedef struct _SHNAMEMAPPINGW {
     173    LPWSTR pszOldPath;
     174    LPWSTR pszNewPath;
     175    int   cchOldPath;
     176    int   cchNewPath;
     177} SHNAMEMAPPINGW, *LPSHNAMEMAPPINGW;
    174178
    175179typedef struct _SHFILEOPSTRUCTA
    … …  
    292296#pragma pack(4)
    293297
     298#ifdef __cplusplus
     299} // extern "C"
     300#endif
     301
    294302#endif /* _WINE_SHELLAPI_H */
Note: See TracChangeset for help on using the changeset viewer.