util/strndup: move header inclusion as applicable

[mesa.git] / src / util / rounding.h

diff --git a/src/util/rounding.h b/src/util/rounding.h
index 868e1b434dbbea8b39735d4f2c83a7bdde677e3a..dfc691eaf1369f21c0375059a5da0ba8e299afc2 100644 (file)
--- a/src/util/rounding.h
+++ b/src/util/rounding.h
@@ -24,12 +24,13 @@
 #ifndef _ROUNDING_H
 #define _ROUNDING_H
 
-#include "c99_compat.h" // inline
+#include "c99_math.h"
 
-#include <math.h>
 #include <limits.h>
+#include <stdint.h>
 
-#ifdef __x86_64__
+#if defined(__SSE__) || defined(_MSC_VER)
+/* MSVC always has SSE nowadays */
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #endif
@@ -95,13 +96,13 @@ _mesa_roundeven(double x)
 static inline long
 _mesa_lroundevenf(float x)
 {
-#ifdef __x86_64__
-#if LONG_BIT == 64
+#if defined(__SSE__) || defined(_MSC_VER)
+#if LONG_MAX == INT64_MAX
    return _mm_cvtss_si64(_mm_load_ss(&x));
-#elif LONG_BIT == 32 || defined(_WIN32)
+#elif LONG_MAX == INT32_MAX
    return _mm_cvtss_si32(_mm_load_ss(&x));
 #else
-#error "Unsupported or undefined LONG_BIT"
+#error "Unsupported long size"
 #endif
 #else
    return lrintf(x);
@@ -115,13 +116,13 @@ _mesa_lroundevenf(float x)
 static inline long
 _mesa_lroundeven(double x)
 {
-#ifdef __x86_64__
-#if LONG_BIT == 64
+#if defined(__SSE__) || defined(_MSC_VER)
+#if LONG_MAX == INT64_MAX
    return _mm_cvtsd_si64(_mm_load_sd(&x));
-#elif LONG_BIT == 32 || defined(_WIN32)
+#elif LONG_MAX == INT32_MAX
    return _mm_cvtsd_si32(_mm_load_sd(&x));
 #else
-#error "Unsupported or undefined LONG_BIT"
+#error "Unsupported long size"
 #endif
 #else
    return lrint(x);