From: Brian Paul <brianp@vmware.com>
Date: Tue, 5 Nov 2013 00:47:19 +0000 (-0700)
Subject: mesa: remove OPENSTEP stuff
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2671b576b22614d1b424a1fe70f84ee6c3920d13;p=mesa.git

mesa: remove OPENSTEP stuff

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 1d21df75db9..d0710bac860 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 61ce5dbdc78..e3c856065a2 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 */