Merged from trunk: 2011-07-01 Jacek Caban <jacek@codeweavers.com> (rev. 4235) * winnt.h (FORCEINLINE): Define without extern for __cplusplus. 2011-07-01 Ozkan Sezer <sezeroz@gmail.com> (rev. 4238) * ntdef.h (FORCEINLINE): Mirror the __GNUG__ case of FORCEINLINE definition in ntdef.h. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4239 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index 8192550..7c2ac19 100644 --- a/mingw-w64-headers/include/ChangeLog +++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,12 @@ +2011-07-01 Ozkan Sezer <sezeroz@gmail.com> + + Merged from trunk: + 2011-07-01 Jacek Caban <jacek@codeweavers.com> (rev. 4235) + * winnt.h (FORCEINLINE): Define without extern for __cplusplus. + 2011-07-01 Ozkan Sezer <sezeroz@gmail.com> (rev. 4238) + * ntdef.h (FORCEINLINE): Mirror the __GNUG__ case of FORCEINLINE + definition in ntdef.h. + 2011-06-23 Kai Tietz <ktietz@redhat.com> * basetyps.h (DECLARE_INTERFACE_IID_): New macro.
diff --git a/mingw-w64-headers/include/ntdef.h b/mingw-w64-headers/include/ntdef.h index ae83535..91bb770 100644 --- a/mingw-w64-headers/include/ntdef.h +++ b/mingw-w64-headers/include/ntdef.h
@@ -197,6 +197,8 @@ #define FORCEINLINE __forceinline #elif defined(_MSC_VER) #define FORCEINLINE __inline +#elif defined(__cplusplus) /* __GNUG__ */ +#define FORCEINLINE inline __attribute__((always_inline)) #else /* __GNUC__ */ #define FORCEINLINE extern __inline__ __attribute__((always_inline)) #endif
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h index 9987e3a..e4ac46f 100644 --- a/mingw-w64-headers/include/winnt.h +++ b/mingw-w64-headers/include/winnt.h
@@ -147,6 +147,8 @@ #define FORCEINLINE __forceinline #elif defined(_MSC_VER) #define FORCEINLINE __inline +#elif defined(__cplusplus) /* __GNUG__ */ +#define FORCEINLINE inline __attribute__((always_inline)) #else /* __GNUC__ */ #define FORCEINLINE extern __inline__ __attribute__((always_inline)) #endif