Mesa (master): mesa: remove BUILD_FOR_SNAP bits
Brian Paul
brianp at kemper.freedesktop.org
Mon Nov 4 19:36:04 UTC 2013
Module: Mesa
Branch: master
Commit: 61ec037c61de3e068250e530ac073c2b0f250a1b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=61ec037c61de3e068250e530ac073c2b0f250a1b
Author: Brian Paul <brianp at vmware.com>
Date: Mon Nov 4 07:29:57 2013 -0700
mesa: remove BUILD_FOR_SNAP bits
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mesa/main/compiler.h | 10 ++++------
src/mesa/main/glheader.h | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index d806d5b..2490ee3 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -92,7 +92,7 @@ extern "C" {
/**
* Disable assorted warnings
*/
-#if !defined(OPENSTEP) && (defined(_WIN32) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
+#if !defined(OPENSTEP) && (defined(_WIN32) && !defined(__CYGWIN__))
# if !defined(__GNUC__) /* mingw environment */
# pragma warning( disable : 4068 ) /* unknown pragma */
# pragma warning( disable : 4710 ) /* function 'foo' not inlined */
@@ -198,7 +198,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
-#if !defined(CAPI) && defined(_WIN32) && !defined(BUILD_FOR_SNAP)
+#if !defined(CAPI) && defined(_WIN32)
#define CAPI _cdecl
#endif
@@ -208,7 +208,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
* than GNU C
*/
#ifndef _ASMAPI
-#if defined(_WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
+#if defined(_WIN32)
#define _ASMAPI __cdecl
#else
#define _ASMAPI
@@ -239,9 +239,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
* ASSERT macro
*/
#if !defined(_WIN32_WCE)
-#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
-# define ASSERT(X) _CHECK(X)
-#elif defined(DEBUG)
+#if defined(DEBUG)
# define ASSERT(X) assert(X)
#else
# define ASSERT(X)
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 4ed51b3..e027218 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -38,7 +38,7 @@
#endif
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
# define WGLAPI __declspec(dllexport)
# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
More information about the mesa-commit
mailing list