diff options
| author | Sven Gothel <[email protected]> | 2013-07-15 20:08:52 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-07-15 20:08:52 +0200 |
| commit | 4af77a92acf5bc2e27f9dea444a8c84d6775cf77 (patch) | |
| tree | 1b65c14531f762e6748f41d1acba8939801e96ca /make/stub_includes/opengl/GL/gl-platform.h | |
| parent | d5599155b28f63a83112d4a4268c2cca246c9e28 (diff) | |
Fix regressions of commit 3a0d7703da32e9a5ddf08a334f18588a78038d88: Avoid CPP redefinitions
Diffstat (limited to 'make/stub_includes/opengl/GL/gl-platform.h')
| -rw-r--r-- | make/stub_includes/opengl/GL/gl-platform.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/make/stub_includes/opengl/GL/gl-platform.h b/make/stub_includes/opengl/GL/gl-platform.h index 58df2cfd3..d07fd92ce 100644 --- a/make/stub_includes/opengl/GL/gl-platform.h +++ b/make/stub_includes/opengl/GL/gl-platform.h @@ -21,13 +21,17 @@ # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern # endif /* _STATIC_MESA support */ -# define APIENTRY __stdcall +# ifndef APIENTRY +# define APIENTRY __stdcall +# endif /* APIENTRY */ #else /* non-Windows compilation */ # ifndef GLAPI # define GLAPI extern # endif -# define APIENTRY +# ifndef APIENTRY +# define APIENTRY +# endif /* APIENTRY */ #endif /* WIN32 / CYGWIN bracket */ #if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) @@ -47,9 +51,11 @@ #include <windows.h> #endif +/** #if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__) #include <gl/mesa_wgl.h> #endif +*/ #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED #pragma import on |