Mesa (mesa_7_7_branch): mesa: Fix missing finite symbol error on Windows.

Ian Romanick idr at kemper.freedesktop.org
Mon Dec 21 18:32:56 PST 2009


Module: Mesa
Branch: mesa_7_7_branch
Commit: 09415ca234d18d4daf257afc0ced52687fdf43a8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09415ca234d18d4daf257afc0ced52687fdf43a8

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Sep 24 12:36:11 2009 +0100

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)

---

 src/mesa/main/compiler.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index a296404..4eb249b 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



More information about the mesa-commit mailing list