commit 0a860a01f918b12dc54e5fa5153ffc69480f2319
author Alexandre Julliard <julliard@winehq.org> Tue Jun 22 11:43:42 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jun 22 11:43:42 1999 +0000
tree b48662c5bcb0c057e65abe2dd5457df87b9d5b38
parent 385287a011e39c09e2c9cb19b53f9162540ca71f

Merged THDB and TEB structures.
Made SetLastError(), GetCurrentThreadId() and PROCESS_Current() inline.

include/winbase.h

diff --git a/include/winbase.h b/include/winbase.h
index c992ed2..2cd5b50 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1303,7 +1303,6 @@
 HANDLE    WINAPI GetCurrentProcess(void);
 DWORD       WINAPI GetCurrentProcessId(void);
 HANDLE    WINAPI GetCurrentThread(void);
-DWORD       WINAPI GetCurrentThreadId(void);
 INT       WINAPI GetDateFormatA(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT);
 INT       WINAPI GetDateFormatW(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT);
 #define     GetDateFormat WINELIB_NAME_AW(GetDateFormat)
@@ -1493,7 +1492,6 @@
 LCID        WINAPI GetSystemDefaultLCID(void);
 LANGID      WINAPI GetUserDefaultLangID(void);
 LCID        WINAPI GetUserDefaultLCID(void);
-VOID        WINAPI SetLastError(DWORD);
 ATOM        WINAPI AddAtomA(LPCSTR);
 ATOM        WINAPI AddAtomW(LPCWSTR);
 #define     AddAtom WINELIB_NAME_AW(AddAtom)
@@ -1741,6 +1739,13 @@
 INT       WINAPI lstrcmpiW(LPCWSTR,LPCWSTR);
 #define     lstrcmpi WINELIB_NAME_AW(lstrcmpi)
 
+/* the following may be macros when compiling Wine */
+#ifndef SetLastError
+VOID WINAPI SetLastError(DWORD);
+#endif
+#ifndef GetCurrentThreadId
+DWORD WINAPI GetCurrentThreadId(void);
+#endif
 
 #ifdef __cplusplus
 }