summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-09-24 12:36:11 +0100
committerVinson Lee <vlee@vmware.com>2009-12-21 17:56:25 -0800
commit09415ca234d18d4daf257afc0ced52687fdf43a8 (patch)
tree87c4dbb776361f1ca1276d5177f99bf897f9f22a
parentde7021b71c1920eeb181d430f2ae2463f964d7cf (diff)
mesa: Fix missing finite symbol error on Windows.
Caused by some weird logic regarding the __WIN32__ define which made the finite definition dependent on the header include order. (cherry picked from commit 622bdecabd73167d2f2f3aff0e223a8c64433f99)
-rw-r--r--src/mesa/main/compiler.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index a296404df7..4eb249b4af 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -107,8 +107,7 @@ extern "C" {
/**
* finite macro.
*/
-#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
-# define __WIN32__
+#if defined(_MSC_VER)
# define finite _finite
#elif defined(__WATCOMC__)
# define finite _finite