diff options
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/gl.h | 11 | ||||
| -rw-r--r-- | include/GL/internal/glcore.h | 2 | ||||
| -rw-r--r-- | include/GL/internal/sarea.h | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 3891a718751..c9ef6136fab 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -58,7 +58,11 @@ # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern # endif /* _STATIC_MESA support */ -# define GLAPIENTRY __stdcall +# if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */ +# define GLAPIENTRY +# else +# define GLAPIENTRY __stdcall +# endif #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */ # define GLAPI extern # define GLAPIENTRY __stdcall @@ -84,8 +88,9 @@ #include <windows.h> #endif -#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \ - && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WIN32_WCE) \ + && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) \ + && !defined(__CYGWIN__) || defined(__MINGW32__) #include <GL/mesa_wgl.h> #endif diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h index 1bb63c1aee6..a3af3b5a34e 100644 --- a/include/GL/internal/glcore.h +++ b/include/GL/internal/glcore.h @@ -36,7 +36,9 @@ ** */ +#if !defined(_WIN32_WCE) #include <sys/types.h> +#endif #define GL_CORE_SGI 1 #define GL_CORE_MESA 2 diff --git a/include/GL/internal/sarea.h b/include/GL/internal/sarea.h index 77c16e0efe2..a0d6084f31d 100644 --- a/include/GL/internal/sarea.h +++ b/include/GL/internal/sarea.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ /** * \file sarea.h * SAREA definitions. @@ -34,7 +33,6 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ #ifndef _SAREA_H_ #define _SAREA_H_ |