2 files changed, 11 insertions, 4 deletions
diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h
index 0411c42c5..3fd01c5bb 100644
--- a/winsup/w32api/include/windef.h
+++ b/winsup/w32api/include/windef.h
@@ -156,8 +156,8 @@ extern "C" {
 #define DBG_UNREFERENCED_PARAMETER(P)
 #define DBG_UNREFERENCED_LOCAL_VARIABLE(L)
 
-#ifdef __GNUC__
 #ifndef NONAMELESSUNION
+#ifdef __GNUC__
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
 #define _ANONYMOUS_UNION __extension__
 #define _ANONYMOUS_STRUCT __extension__
@@ -166,11 +166,11 @@ extern "C" {
 #define _ANONYMOUS_UNION __extension__
 #endif /* __cplusplus */
 #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */
-#endif /* NONAMELESSUNION */
 #elif defined(__WATCOMC__)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif /* __GNUC__/__WATCOMC__ */
+#endif /* NONAMELESSUNION */
 
 #ifndef _ANONYMOUS_UNION
 #define _ANONYMOUS_UNION
@@ -279,12 +279,11 @@ DECLARE_HANDLE(HFONT);
 DECLARE_HANDLE(HICON);
 DECLARE_HANDLE(HKEY);
 /* FIXME: How to handle these. SM_CMONITORS etc in winuser.h also. */
-/* #if (WINVER >= 0x0500) */
 DECLARE_HANDLE(HMONITOR);
 #define HMONITOR_DECLARED 1
 DECLARE_HANDLE(HTERMINAL);
 DECLARE_HANDLE(HWINEVENTHOOK);
-/* #endif */
+
 typedef HKEY *PHKEY;
 DECLARE_HANDLE(HMENU);
 DECLARE_HANDLE(HMETAFILE);
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 24ab2004b..2db64bd93 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -3897,16 +3897,24 @@ static __inline__ struct _TEB * NtCurrentTeb(void)
 
 #else
 
+PVOID GetCurrentFiber(void);
 #pragma aux GetCurrentFiber = \
         "mov	eax, dword ptr fs:0x10" \
         value [eax] \
         modify [eax];
 
+PVOID GetFiberData(void);
 #pragma aux GetFiberData = \
 	"mov	eax, dword ptr fs:0x10" \
 	"mov	eax, [eax]" \
         value [eax] \
         modify [eax];
+           
+struct _TEB * NtCurrentTeb(void);
+#pragma aux NtCurrentTeb = \
+        "mov	eax, dword ptr fs:0x18" \
+        value [eax] \
+        modify [eax];
         
 #endif /* __GNUC__ */
 #endif /* _X86_ */