Merge commit 'c5a6237a2b002c9811719172931b0c9cc5a725f4' into master-merge

[xonotic/netradiant.git] / libs / math / vector.h

diff --git a/libs/math/vector.h b/libs/math/vector.h
index 9ec5159ff905ed2328e66245e93d6b523e7e5a8e..c2b45b501ffe1d7e592e1865515e4b091264fc04 100644 (file)
--- a/libs/math/vector.h
+++ b/libs/math/vector.h
@@ -26,8 +26,9 @@
 /// \brief Vector data types and related operations.
 
 #include "generic/vector.h"
+#include "globaldefs.h"
 
-#if defined ( _MSC_VER )
+#if GDEF_COMPILER_MSVC
 
 inline int lrint( double flt ){
        int i;
@@ -45,17 +46,7 @@ inline __int64 llrint( double f ){
        return static_cast<__int64>( f + 0.5 );
 }
 
-#elif defined( __FreeBSD__ )
-
-inline long lrint( double f ){
-       return static_cast<long>( f + 0.5 );
-}
-
-inline long long llrint( double f ){
-       return static_cast<long long>( f + 0.5 );
-}
-
-#elif defined( __GNUC__ )
+#elif GDEF_COMPILER_GNU
 
 // lrint is part of ISO C99
 #define _ISOC9X_SOURCE  1