Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / include / c99_math.h

diff --git a/include/c99_math.h b/include/c99_math.h
index ee0dd105e4989952a1d778bc69cf737ea06fc6e4..8a67fb133d6e26013c0e5be8e5d84d33d0a5b5e9 100644 (file)
--- a/include/c99_math.h
+++ b/include/c99_math.h
@@ -83,7 +83,11 @@ roundf(float x)
 
 
 #if (defined(_MSC_VER) && _MSC_VER < 1800) || \
-    (!defined(_MSC_VER) && __STDC_VERSION__ < 199901L && !defined(__cplusplus))
+    (!defined(_MSC_VER) && \
+     __STDC_VERSION__ < 199901L && \
+     (!defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600) && \
+     !defined(__cplusplus))
+
 static inline long int
 lrint(double d)
 {
@@ -135,6 +139,19 @@ llrintf(float f)
 
    return rounded;
 }
+
+static inline float
+exp2f(float f)
+{
+   return powf(2.0f, f);
+}
+
+static inline double
+exp2(double d)
+{
+   return pow(2.0, d);
+}
+
 #endif /* C99 */