Mesa (master): mesa: remove OPENSTEP stuff
Brian Paul
brianp at kemper.freedesktop.org
Tue Nov 5 01:11:46 UTC 2013
Module: Mesa
Branch: master
Commit: 2671b576b22614d1b424a1fe70f84ee6c3920d13
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2671b576b22614d1b424a1fe70f84ee6c3920d13
Author: Brian Paul <brianp at vmware.com>
Date: Mon Nov 4 17:47:19 2013 -0700
mesa: remove OPENSTEP stuff
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
include/GL/gl.h | 6 +-----
src/mesa/main/compiler.h | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/include/GL/gl.h b/include/GL/gl.h
index 1d21df7..d0710ba 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -40,15 +40,11 @@
#include <stdlib.h> /* to get some BeOS-isms */
#endif
-#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
-#define OPENSTEP
-#endif
-
#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
#define __WIN32__
#endif
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
+#if defined(__WIN32__) && !defined(__CYGWIN__)
# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
# define GLAPI __declspec(dllexport)
# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 61ce5db..e3c8560 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -90,7 +90,7 @@ extern "C" {
/**
* Disable assorted warnings
*/
-#if !defined(OPENSTEP) && (defined(_WIN32) && !defined(__CYGWIN__))
+#if defined(_WIN32) && !defined(__CYGWIN__)
# if !defined(__GNUC__) /* mingw environment */
# pragma warning( disable : 4068 ) /* unknown pragma */
# pragma warning( disable : 4710 ) /* function 'foo' not inlined */
More information about the mesa-commit
mailing list