Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
5 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/wine/debug.h

    r8208 r21916  
    2222#define __WINE_WINE_DEBUG_H
    2323
    24 #include <win\debugtools.h>
     24#include <win/debugtools.h>
    2525#include <stdarg.h>
    2626

  • trunk/include/win/wine/obj_base.h

    r21493 r21916  
    703703typedef struct IMalloc16 IMalloc16,*LPMALLOC16;
    704704typedef struct IMalloc IMalloc,*LPMALLOC;
     705typedef const IMalloc *LPCMALLOC;
    705706
    706707DEFINE_OLEGUID(IID_IUnknown,            0x00000000L, 0, 0);

  • trunk/include/win/wine/obj_surrogate.h

    r641 r21916  
    4646#endif // __WINE_WINE_OBJ_SURROGATE_H
    4747
    48 
     48

  • trunk/include/win/wine/winbase16.h

    r641 r21916  
    171171DWORD       WINAPI RegCreateKey16(HKEY,LPCSTR,LPHKEY);
    172172DWORD       WINAPI RegDeleteKey16(HKEY,LPCSTR);
    173 DWORD       WINAPI RegDeleteValue16(HKEY,LPSTR);
     173DWORD       WINAPI RegDeleteValue16(HKEY,LPCSTR);
    174174DWORD       WINAPI RegEnumKey16(HKEY,DWORD,LPSTR,DWORD);
    175175DWORD       WINAPI RegEnumValue16(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
    … …  
    178178DWORD       WINAPI RegQueryValueEx16(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
    179179DWORD       WINAPI RegSetValue16(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
    180 DWORD       WINAPI RegSetValueEx16(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
     180DWORD       WINAPI RegSetValueEx16(HKEY,LPSTR,DWORD,DWORD,const BYTE *,DWORD);
    181181BOOL16      WINAPI RemoveDirectory16(LPCSTR);
    182182BOOL16      WINAPI SetCurrentDirectory16(LPCSTR);
Note: See TracChangeset for help on using the changeset viewer.