From f7ba12a587127bd4655984f00a694e0ad669999a Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sf.net>
Date: Tue, 1 Jul 2003 23:37:00 +0000
Subject: [PATCH] 	* include/basetyps.h (small, hyper): Change to __small
 and __hyper to 	avoid user namespace conflicts.

---
 winsup/w32api/ChangeLog          | 5 +++++
 winsup/w32api/include/basetyps.h | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 702d7fa85..4d6f4f61b 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-01  Earnie Boyd  <earnie@users.sf.net>
+
+	* include/basetyps.h (small, hyper): Change to __small and __hyper to
+	avoid user namespace conflicts.
+
 2003-07-01  Earnie Boyd  <earnie@users.sf.net>
 
 	* include/w32api.h (_NT4, _W98, _WME, _NT5, _W2000, _WXP, _W2003,
diff --git a/winsup/w32api/include/basetyps.h b/winsup/w32api/include/basetyps.h
index 3aad6d352..9f4e604a9 100644
--- a/winsup/w32api/include/basetyps.h
+++ b/winsup/w32api/include/basetyps.h
@@ -22,11 +22,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
 # define STDMETHODCALLTYPE	__stdcall
 # define STDMETHODVCALLTYPE	__cdecl