summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2015-02-26 13:22:36 -0700
committerBrian Paul <[email protected]>2015-02-28 13:39:57 -0700
commit8a25e73df3a38bdbd9e880138edd3000ff54a609 (patch)
tree9aa73899f1dcfd3f152cff12ba42aaac706d4e57 /src/mesa
parent977c56df09f8d6753df2618de5a25307b7e6df7d (diff)
mesa: move finite macro to imports.h
Move it to the only place it's used. Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/compiler.h8
-rw-r--r--src/mesa/main/imports.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index a0d2a293d8a..a0ef75a24fd 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -64,14 +64,6 @@ extern "C" {
/**
- * finite macro.
- */
-#if defined(_MSC_VER)
-# define finite _finite
-#endif
-
-
-/**
* Disable assorted warnings
*/
#if defined(_WIN32) && !defined(__CYGWIN__)
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 838b985b215..79210006109 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -121,6 +121,14 @@ static inline GLfloat LOG2(GLfloat x)
+/**
+ * finite macro.
+ */
+#if defined(_MSC_VER)
+# define finite _finite
+#endif
+
+
/***
*** IS_INF_OR_NAN: test if float is infinite or NaN
***/