Changeset 2797 for code/trunk/src/OrxonoxConfig.h.in

Timestamp:

Mar 17, 2009, 10:53:53 PM (15 years ago)

Author:

landauf

Message:

Added some #ifndef's around #define NOMINMAX and #define FORCEINLINE to avoid "symbol redefined" compiler-warnings.

Reto, I hope this doesn't cause any troubles. If it does, I suggest using "#undef symbolname" instead of "#ifndef symbolname". This should then work basically as before, but without warnings.

File:

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

code/trunk/src/OrxonoxConfig.h.in

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