Changeset 7621 for code/branches/ois_update/src/OrxonoxConfig.h.in

Timestamp:

Nov 6, 2010, 3:05:53 PM (14 years ago)

Author:

rgrieder

Message:

Renamed FORCEINLINE macro to ORX_FORCEINLINE because of conflicts (resulting in a load of warnings with Ogre v1.7 and gcc) with OgrePlatform.h.

File:

• code/branches/ois_update/src/OrxonoxConfig.h.in (modified) (1 diff)

code/branches/ois_update/src/OrxonoxConfig.h.in

@@ -88 +88 @@
 // See if we can use __forceinline or if we need to use __inline instead
 #cmakedefine HAVE_FORCEINLINE
-#ifndef FORCEINLINE
+#ifndef ORX_FORCEINLINE
 #  ifdef HAVE_FORCEINLINE
-#    define FORCEINLINE __forceinline
+#    define ORX_FORCEINLINE __forceinline
 #  else
-#    define FORCEINLINE __inline
+#    define ORX_FORCEINLINE __inline
 #  endif
 #endif