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

    r21327 r21916  
    124124    DWORD       ve_type;
    125125} VALENTW, *PVALENTW;
     126
     127#ifdef __cplusplus
     128extern "C" {
     129#endif
    126130
    127131BOOL      WINAPI LookupPrivilegeValueA(LPCSTR,LPCSTR,LPVOID);
    … …  
    195199LONG       WINAPI RegDeleteKeyW(HKEY,LPCWSTR);
    196200#define     RegDeleteKey WINELIB_NAME_AW(RegDeleteKey)
    197 LONG       WINAPI RegDeleteValueA(HKEY,LPSTR);
    198 LONG       WINAPI RegDeleteValueW(HKEY,LPWSTR);
     201LONG       WINAPI RegDeleteValueA(HKEY,LPCSTR);
     202LONG       WINAPI RegDeleteValueW(HKEY,LPCWSTR);
    199203#define     RegDeleteValue WINELIB_NAME_AW(RegDeleteValue)
    200204LSTATUS   WINAPI RegDeleteTreeA(HKEY,LPCSTR);
    … …  
    219223LONG       WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
    220224#define     RegSetValue WINELIB_NAME_AW(RegSetValue)
    221 LONG       WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,LPBYTE,DWORD);
    222 LONG       WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,LPBYTE,DWORD);
     225LONG       WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,const BYTE *,DWORD);
     226LONG       WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,const BYTE *,DWORD);
    223227#define     RegSetValueEx WINELIB_NAME_AW(RegSetValueEx)
    224228
    … …  
    227231#define     RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues)
    228232
     233#ifdef __cplusplus
     234} // extern "C"
     235#endif
     236
    229237#endif  /* __WINE_WINREG_H */
Note: See TracChangeset for help on using the changeset viewer.