diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2003-07-01 23:37:00 +0000 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2003-07-01 23:37:00 +0000 |
| commit | f7ba12a587127bd4655984f00a694e0ad669999a (patch) | |
| tree | 4ecc79cd262339d41cef95c7bade9bb80b43ab35 | |
| parent | acd2330e326491769f4f0030fbc91f6d150a38b0 (diff) | |
| download | newlib-f7ba12a587127bd4655984f00a694e0ad669999a.zip newlib-f7ba12a587127bd4655984f00a694e0ad669999a.tar.gz newlib-f7ba12a587127bd4655984f00a694e0ad669999a.tar.bz2 | |
* include/basetyps.h (small, hyper): Change to __small and __hyper to
avoid user namespace conflicts.
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/basetyps.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 702d7fa..4d6f4f6 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,10 @@ 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, _IE3, _IE4, _IE5, _IE6): Add definitions. * include/winbase.h (GetLongPathName[AW]): Add guard for OS >= NT5 or diff --git a/winsup/w32api/include/basetyps.h b/winsup/w32api/include/basetyps.h index 3aad6d3..9f4e604 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 |