From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Mon, 23 Jun 2008 17:37:21 +0000 (+0900)
Subject: mesa: ASSERT macro is already defined by WinCE headers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8db7ef544c4f1be702e34b97882441df31274f10;p=mesa.git

mesa: ASSERT macro is already defined by WinCE headers.

Even when just the standard headers are used....
---

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 0f74bc83ccc..9e39a8370e6 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -233,6 +233,7 @@
 #endif
 
 
+#if !defined(_WIN32_WCE)
 #if defined(BUILD_FOR_SNAP) && defined(CHECKED)
 #  define ASSERT(X)   _CHECK(X) 
 #elif defined(DEBUG)
@@ -240,6 +241,7 @@
 #else
 #  define ASSERT(X)
 #endif
+#endif
 
 
 #if !defined __GNUC__ || __GNUC__ < 3