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

    r21602 r21916  
    1111#include <win32type.h>
    1212#include <winconst.h>
     13
     14#ifdef __cplusplus
     15extern "C" {
     16#endif
    1317
    1418void   WIN32API SetLastError(DWORD dwError);
    … …  
    2529LONG   WIN32API RegDeleteKeyA(HKEY,LPCSTR);
    2630LONG   WIN32API RegDeleteKeyW(HKEY,LPWSTR);
    27 LONG   WIN32API RegDeleteValueA(HKEY,LPSTR);
    28 LONG   WIN32API RegDeleteValueW(HKEY,LPWSTR);
     31LONG   WIN32API RegDeleteValueA(HKEY,LPCSTR);
     32LONG   WIN32API RegDeleteValueW(HKEY,LPCWSTR);
    2933LONG   WIN32API RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD);
    3034LONG   WIN32API RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD);
    … …  
    3741LONG   WIN32API RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG);
    3842LONG   WIN32API RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG);
    39 LONG   WIN32API RegQueryValueExA(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
    40 LONG   WIN32API RegQueryValueExW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
     43LONG   WIN32API RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
     44LONG   WIN32API RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
    4145LONG   WIN32API RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
    4246LONG   WIN32API RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
    43 LONG   WIN32API RegSetValueExA(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
    44 LONG   WIN32API RegSetValueExW(HKEY,LPWSTR,DWORD,DWORD,LPBYTE,DWORD);
     47LONG   WIN32API RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,const BYTE *,DWORD);
     48LONG   WIN32API RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,const BYTE *,DWORD);
    4549
    4650DWORD  WIN32API GetModuleFileNameA(HMODULE,LPSTR,DWORD);
    … …  
    263267BOOL      WINAPI IsDBCSLeadByte(BYTE);
    264268
     269#ifdef __cplusplus
     270} // extern "C"
    265271#endif
     272
     273#endif
Note: See TracChangeset for help on using the changeset viewer.