diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:26:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:27:25 +0100 |
| commit | c97d11aec40d8fa07d6b456bf8694133a77d35f4 (patch) | |
| tree | 9e14e6f970a86af9f7107053c5c709e2e440d032 /mesalib/include | |
| parent | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (diff) | |
| parent | f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 (diff) | |
| download | vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.gz vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.bz2 vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013
Conflicts:
xorg-server/include/servermd.h
Diffstat (limited to 'mesalib/include')
| -rw-r--r-- | mesalib/include/GL/gl.h | 31 | ||||
| -rw-r--r-- | mesalib/include/GL/osmesa.h | 5 |
2 files changed, 2 insertions, 34 deletions
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. |