texenv: Match state.c in deciding whether we'll be using a vertex shader.

[mesa.git] / src / mesa / main / compiler.h

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 39b19bb776766f831f119de21ffe5469fdc02e72..9319505a75d32ff499d73e24403829062185486c 100644 (file)
--- 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
+
 
 
 /**
@@ -230,7 +232,10 @@ extern "C" {
 #if defined(__linux__)
 #include <byteswap.h>
 #define CPU_TO_LE32( x )       bswap_32( x )
-#else /*__linux__*/
+#elif defined(__APPLE__)
+#include <CoreFoundation/CFByteOrder.h>
+#define CPU_TO_LE32( x )       CFSwapInt32HostToLittle( x )
+#else /*__linux__ __APPLE__*/
 #include <sys/endian.h>
 #define CPU_TO_LE32( x )       bswap32( x )
 #endif /*__linux__*/
@@ -465,9 +470,9 @@ do {                                                                    \
 #endif
 
 
-
+#ifndef Elements
 #define Elements(x) (sizeof(x)/sizeof(*(x)))
-
+#endif