From f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 7 Nov 2013 08:21:08 +0100
Subject: xextproto fontconfig libxcb mesa xserver git update  7 Nov 2013

xserver          commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be
libxcb           commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6
libxcb/xcb-proto commit 530817c5a926f006d8d61f9dcfd9ab73269a9805
xextproto        commit 3f355f138d6df57e067458a20f47307883048adb
fontconfig       commit a4443e64c89256087d40462cfbb482950873e366
mesa             commit 110009302bddb4c42a5b3ed5ca451d6bb50a06a0
---
 mesalib/include/GL/gl.h     | 31 ++-----------------------------
 mesalib/include/GL/osmesa.h |  5 -----
 2 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'mesalib/include')

diff --git a/mesalib/include/GL/gl.h b/mesalib/include/GL/gl.h
index 6b94e3fb0..b484b96ce 100644
--- a/mesalib/include/GL/gl.h
+++ b/mesalib/include/GL/gl.h
@@ -33,25 +33,14 @@
 
 
 /**********************************************************************
- * Begin system-specific stuff. Do not do any of this when building
- * for SciTech SNAP, as this is all done before this header file is
- * included. 
+ * Begin system-specific stuff.
  */
-#if !defined(__SCITECH_SNAP__)
-
-#if defined(__BEOS__)
-#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 */
@@ -72,10 +61,6 @@
 #  define GLAPIENTRY
 #endif /* WIN32 && !CYGWIN */
 
-#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
-#  define PRAGMA_EXPORT_SUPPORTED		1
-#endif
-
 /*
  * WINDOWS: Include windows.h here to define APIENTRY.
  * It is also useful when applications include this file by
@@ -91,10 +76,6 @@
 #include <windows.h>
 #endif
 
-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
-#pragma import on
-#endif
-
 #ifndef GLAPI
 #define GLAPI extern
 #endif
@@ -116,15 +97,10 @@
 #define GLAPIENTRYP GLAPIENTRY *
 #endif
 
-#ifdef CENTERLINE_CLPP
-#define signed
-#endif
-
 #if defined(PRAGMA_EXPORT_SUPPORTED)
 #pragma export on
 #endif
 
-#endif /* !__SCITECH_SNAP__ */
 /*
  * End system-specific stuff.
  **********************************************************************/
@@ -2177,9 +2153,6 @@ typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t
 #pragma export off
 #endif
 
-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
-#pragma import off
-#endif
 /*
  * End system-specific stuff
  **********************************************************************/
diff --git a/mesalib/include/GL/osmesa.h b/mesalib/include/GL/osmesa.h
index c36f64981..10c472d49 100644
--- a/mesalib/include/GL/osmesa.h
+++ b/mesalib/include/GL/osmesa.h
@@ -101,11 +101,6 @@ extern "C" {
 typedef struct osmesa_context *OSMesaContext;
 
 
-#if defined(__QUICKDRAW__)
-#pragma export on
-#endif
-
-
 /*
  * Create an Off-Screen Mesa rendering context.  The only attribute needed is
  * an RGBA vs Color-Index mode flag.
-- 
cgit v1.2.3