* include/_mingw.h (small, hyper): Change to __small and __hyper to

	avoid user space name conflicts.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 5b01c25..15fdcaf 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,5 +1,10 @@
 2003-07-01  Earnie Boyd  <earnie@users.sf.net>
 
+       * include/_mingw.h (small, hyper): Change to __small and __hyper to
+       avoid user space name conflicts.
+
+2003-07-01  Earnie Boyd  <earnie@users.sf.net>
+
        * include/_mingw.h (__int32, __int16, __int8, small, hyper): Define.
        Note: Also added to w32api/include/basetyps.h.
        * mingwex/math/tgamma.c, tgammaf.c, tgammal.c (small): 

diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index cb535b0..71fd170 100644 (file)
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -92,11 +92,11 @@
 # ifndef __int8
 #  define __int8 char
 # endif
-# ifndef small
-#  define small char
+# ifndef __small
+#  define __small char
 # endif
-# ifndef hyper
-#  define hyper long long
+# ifndef __hyper
+#  define __hyper long long
 # endif
 #endif /* __GNUC__ */