qdefs: Change ALWAYSINLINE -> ALWAYS_INLINE

[xonotic/darkplaces.git] / qdefs.h

diff --git a/qdefs.h b/qdefs.h
index 5d0655f77f6e0b519bab330b08678166e20e639f..fa5014649fbfa4129a42ede1b3cff152b5899888 100644 (file)
--- a/qdefs.h
+++ b/qdefs.h
@@ -9,15 +9,21 @@
 #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_ALWAYS_INLINE inline __attribute__((always_inline))
 #else
 #define DP_FUNC_PRINTF(n)
 #define DP_FUNC_PURE
 #define DP_FUNC_NORETURN
+# if defined (_MSC_VER)
+# define DP_FUNC_ALWAYS_INLINE __forceinline
+# else
+# define DP_FUNC_ALWAYS_INLINE inline
+# endif
 #endif
 
 #ifdef DP_GCC_COMPATIBLE
 #define Q_typeof(var) typeof(var)
-#elif defined (MSVC)
+#elif defined (_MSC_VER)
 #define Q_typeof(var) decltype(var)
 #endif
 
@@ -186,15 +192,13 @@
 // This also includes extended characters, and ALL control chars
 #define ISWHITESPACEORCONTROL(ch) ((signed char) (ch) <= (signed char) ' ')
 
-#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 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 VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g"
-#endif
+#define FLOAT_VECTOR_LOSSLESS_FORMAT "%.9g %.9g %.9g"
 
 // originally this was _MSC_VER
 // but here we want to test the system libc, which on win32 is borked, and NOT the compiler