diff options
| author | Brian <[email protected]> | 2007-07-21 11:27:22 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-07-21 11:27:22 -0600 |
| commit | 005eea249c2565cd33bb7c5f599040ead1ef99a5 (patch) | |
| tree | 2f3124d5d6070be0c2ed6368d58681d9ca5269f4 /include/GL/glut.h | |
| parent | 9747de8ec68aa364a2009ea2bfbaeb48d73a758f (diff) | |
Fix a number of MINGW32 issues (Zhang <[email protected]>)mesa_7_0_1_rc1
Diffstat (limited to 'include/GL/glut.h')
| -rw-r--r-- | include/GL/glut.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/GL/glut.h b/include/GL/glut.h index e0fad6e5cb0..e286349f9b0 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -10,6 +10,10 @@ #include <GL/gl.h> #include <GL/glu.h> +#if defined(__MINGW32__) +#include <GL/mesa_wgl.h> +#endif + #ifdef __cplusplus extern "C" { #endif @@ -108,7 +112,7 @@ extern _CRTIMP void __cdecl exit(int); and redifinition of Windows system defs, also removes requirement of pretty much any standard windows header from this file */ -#if (_MSC_VER >= 800) || defined(__MINGW32__) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) +#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) # define GLUTAPIENTRY __stdcall #else # define GLUTAPIENTRY @@ -130,8 +134,9 @@ extern _CRTIMP void __cdecl exit(int); # pragma message( "----: being multiply defined you should include WINDOWS.H priot to gl/glut.h" ) # endif # define CALLBACK __stdcall -typedef int (GLUTAPIENTRY *PROC)(); + #if !defined(__MINGW32__) + typedef int (GLUTAPIENTRY *PROC)(); typedef void *HGLRC; typedef void *HDC; #endif |