X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=qdefs.h;h=fa5014649fbfa4129a42ede1b3cff152b5899888;hp=c0e4c14ec5932eba5bdfc234777d44d5958254be;hb=1e01840681f92f425aa17e1a18c7dfcf3bf80e40;hpb=a66ee73e39edd25878ca5f5a58f35b125fffca29

diff --git a/qdefs.h b/qdefs.h
index c0e4c14e..fa501464 100644
--- a/qdefs.h
+++ b/qdefs.h
@@ -9,13 +9,13 @@
 #define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1)))
 #define DP_FUNC_PURE      __attribute__ ((pure))
 #define DP_FUNC_NORETURN  __attribute__ ((noreturn))
-#define DP_FUNC_ALWAYSINLINE inline __attribute__((always_inline))
+#define DP_FUNC_ALWAYS_INLINE inline __attribute__((always_inline))
 #else
 #define DP_FUNC_PRINTF(n)
 #define DP_FUNC_PURE
 #define DP_FUNC_NORETURN
-# if defined (MSVC)
-# define DP_FUNC_ALWAYSINLINE __forceinline
+# if defined (_MSC_VER)
+# define DP_FUNC_ALWAYS_INLINE __forceinline
 # else
 # define DP_FUNC_ALWAYS_INLINE inline
 # endif
@@ -23,7 +23,7 @@
 
 #ifdef DP_GCC_COMPATIBLE
 #define Q_typeof(var) typeof(var)
-#elif defined (MSVC)
+#elif defined (_MSC_VER)
 #define Q_typeof(var) decltype(var)
 #endif
 
@@ -195,18 +195,10 @@
 #define DOUBLE_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFFFFFFFFFF) // also match "negative zero" doubles of value 0x8000000000000000
 #define DOUBLE_LOSSLESS_FORMAT "%.17g"
 #define DOUBLE_VECTOR_LOSSLESS_FORMAT "%.17g %.17g %.17g"
+
 #define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFF) // also match "negative zero" floats of value 0x80000000
 #define FLOAT_LOSSLESS_FORMAT "%.9g"
 #define FLOAT_VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g"
-#ifdef PRVM_64
-#define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFFFFFFFFFF) // also match "negative zero" doubles of value 0x8000000000000000
-#define FLOAT_LOSSLESS_FORMAT "%.17g"
-#define VECTOR_LOSSLESS_FORMAT "%.17g %.17g %.17g"
-#else
-#define FLOAT_IS_TRUE_FOR_INT(x) ((x) & 0x7FFFFFFF) // also match "negative zero" floats of value 0x80000000
-#define FLOAT_LOSSLESS_FORMAT "%.9g"
-#define VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g"
-#endif
 
 // originally this was _MSC_VER
 // but here we want to test the system libc, which on win32 is borked, and NOT the compiler