Mesa (mesa_7_5_branch): mesa: separate some finite/pragma Watcom stuff

Brian Paul brianp at kemper.freedesktop.org
Mon Jul 27 21:10:52 UTC 2009


Module: Mesa
Branch: mesa_7_5_branch
Commit: 0ad9eba333bd80cf83f728390c8cd6c573ed446d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ad9eba333bd80cf83f728390c8cd6c573ed446d

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jul 27 15:09:56 2009 -0600

mesa: separate some finite/pragma Watcom stuff

---

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

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index e79bbc2..9319505 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -110,10 +110,8 @@ extern "C" {
 #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
 #  define __WIN32__
 #  define finite _finite
-#endif
-#if defined(__WATCOMC__)
+#elif defined(__WATCOMC__)
 #  define finite _finite
-#  pragma disable_message(201) /* Disable unreachable code warnings */
 #endif
 
 
@@ -135,6 +133,10 @@ extern "C" {
 #    endif
 #  endif
 #endif
+#if defined(__WATCOMC__)
+#  pragma disable_message(201) /* Disable unreachable code warnings */
+#endif
+
 
 
 /**




More information about the mesa-commit mailing list