From: Brian Paul <brianp@vmware.com>
Date: Mon, 27 Jul 2009 21:09:56 +0000 (-0600)
Subject: mesa: separate some finite/pragma Watcom stuff
X-Git-Tag: mesa-7.8~3080^2~81
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ad9eba333bd80cf83f728390c8cd6c573ed446d;p=platform%2Fupstream%2Fmesa.git

mesa: separate some finite/pragma Watcom stuff
---

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
+
 
 
 /**