2007-03-22 Brian Ripley <ripleybd@users.sourceforge.net>

	* include/_mingw.h (__CRT_INLINE): Make conditional on __GNUC_STDC_INLINE__

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 5107ff75546943b27e64ca2d7187168add93e48d..264886416e3ea12bec720ef440c8452a22558aee 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-22   Brian Ripley  <ripleybd@users.sourceforge.net>
+
+       * include/_mingw.h (__CRT_INLINE): Make conditional on __GNUC_STDC_INLINE__.
+
 2003-03-20  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
        * Makefile.in: Tweak srcdist to fix build issue.
@@ -12,7 +16,7 @@
 
 2007-03-18  Danny Smith  <dannysmith@users.sourceforge.net>
 
-       * include/_mingw.h (__CRT_INLINE): Ue __gnu_inline__ for gcc 4.2.x too.
+       * include/_mingw.h (__CRT_INLINE): Use __gnu_inline__ for gcc 4.2.x too.
 
 2007-03-10  Keith Marshall  <keithmarshall@users.sourceforge.net>
 

diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index 26f25273f89455eaeaae512a3397f53a4e5f1f85..b5b32ce80e20ac0237f43946615772e20eaab5af 100644 (file)
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -116,7 +116,7 @@
 #ifdef __cplusplus
 # define __CRT_INLINE inline
 #else
-# if ( __MINGW_GNUC_PREREQ(4, 2)  && __STDC_VERSION__ >= 199901L)
+# if __GNUC_STDC_INLINE__
 #  define __CRT_INLINE extern inline __attribute__((__gnu_inline__))
 # else
 #  define __CRT_INLINE extern __inline__