2011-05-22 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>

        * include/stdlib.h (_rotl, _lrotl, _rotr, _lrotr): Resolve conflict with gcc
        by wrapping the functions in brackets.

        Thanks to Kai Tietz for the report.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 79e63eb6c32eb3c6622783023a8175e5955152e9..2b3dab4bdaaf40e318137c0176d661e87f895bdb 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-22  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+       * include/stdlib.h (_rotl, _lrotl, _rotr, _lrotr): Resolve conflict with gcc
+       by wrapping the functions in brackets.
+
+       Thanks to Kai Tietz for the report.
+
 2011-05-22  A.B., Khalid  <abkhd@users.sourceforge.net>
 
        * Makefile.in: Add support for msvcr100.dll.

diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h
index 55455a276e0bf2d9a6127d73f52df3b2e07c2a6f..43326f4127658d5b3ed862c104176f88947b45cb 100644 (file)
--- a/winsup/mingw/include/stdlib.h
+++ b/winsup/mingw/include/stdlib.h
@@ -440,10 +440,10 @@ _CRTIMP __int64 __cdecl __MINGW_NOTHROW   _wtoi64(const wchar_t *);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _i64tow(__int64, wchar_t *, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _ui64tow(unsigned __int64, wchar_t *, int);
 
-_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _rotl(unsigned int, int) __MINGW_ATTRIB_CONST;
-_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _rotr(unsigned int, int) __MINGW_ATTRIB_CONST;
-_CRTIMP unsigned long __cdecl __MINGW_NOTHROW _lrotl(unsigned long, int) __MINGW_ATTRIB_CONST;
-_CRTIMP unsigned long __cdecl __MINGW_NOTHROW _lrotr(unsigned long, int) __MINGW_ATTRIB_CONST;
+_CRTIMP unsigned int __cdecl __MINGW_NOTHROW (_rotl)(unsigned int, int) __MINGW_ATTRIB_CONST;
+_CRTIMP unsigned int __cdecl __MINGW_NOTHROW (_rotr)(unsigned int, int) __MINGW_ATTRIB_CONST;
+_CRTIMP unsigned long __cdecl __MINGW_NOTHROW (_lrotl)(unsigned long, int) __MINGW_ATTRIB_CONST;
+_CRTIMP unsigned long __cdecl __MINGW_NOTHROW (_lrotr)(unsigned long, int) __MINGW_ATTRIB_CONST;
 
 _CRTIMP int __cdecl __MINGW_NOTHROW _set_error_mode (int);