Index: winsup.h
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/winsup.h,v
retrieving revision 1.69.2.5
diff -u -r1.69.2.5 winsup.h
--- winsup.h	13 Jun 2002 14:34:14 -0000	1.69.2.5
+++ winsup.h	23 Jun 2002 16:20:27 -0000
@@ -25,13 +25,6 @@
 
 #define NO_COPY __attribute__((nocommon)) __attribute__((section(".data_cygwin_nocopy")))
 
-#ifdef EXPCGF
-#define DECLARE_TLS_STORAGE char **tls[4096] __attribute__ ((unused))
-#else
-#define DECLARE_TLS_STORAGE do {} while (0)
-#define _WINBASE2_H
-#endif
-
 #ifdef __cplusplus
 
 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199900L
Index: winbase.h
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/winbase.h,v
retrieving revision 1.2.16.1
diff -u -r1.2.16.1 winbase.h
--- winbase.h	4 Jan 2002 03:56:11 -0000	1.2.16.1
+++ winbase.h	23 Jun 2002 16:20:27 -0000
@@ -1,5 +1,12 @@
 #include_next "winbase.h"
 
+#ifdef EXPCGF
+#define DECLARE_TLS_STORAGE char **tls[4096] __attribute__ ((unused))
+#else
+#define DECLARE_TLS_STORAGE do {} while (0)
+#define _WINBASE2_H
+#endif
+
 #ifndef _WINBASE2_H
 #define _WINBASE2_H