diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-11-08 15:08:48 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-07-11 20:03:32 +0100 |
| commit | 24477c0ef5a055578b6bc287c2f35af03c39da58 (patch) | |
| tree | b7320a3a488f973544d0faad532c125280202acb | |
| parent | ccc60f02bdcd1bc01dbe7b0dbdd30d5b1bb798a7 (diff) | |
| download | glut-24477c0ef5a055578b6bc287c2f35af03c39da58.tar.gz | |
Remove need for defining _MSC_VER when building Mesa for windows with a non MS C compiler (MinGW). (Gregor Anich)
| -rw-r--r-- | include/GL/glut.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/GL/glut.h b/include/GL/glut.h index 3a67f1f..7977dc9 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -75,7 +75,7 @@ extern "C" { To avoid the atexit workaround, #define GLUT_DISABLE_ATEXIT_HACK. */ /* XXX This is from Win32's <process.h> */ -# if !defined(_MSC_VER) && !defined(__cdecl) +# if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__cdecl) /* Define __cdecl for non-Microsoft compilers. */ # define __cdecl # define GLUT_DEFINED___CDECL @@ -108,7 +108,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(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) +#if (_MSC_VER >= 800) || defined(__MINGW32__) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__) # define GLUTAPIENTRY __stdcall #else # define GLUTAPIENTRY |