From 83889ffd970a807074d834849677fd233c031dc7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 8 Nov 2004 15:08:48 +0000 Subject: Remove need for defining _MSC_VER when building Mesa for windows with a non MS C compiler (MinGW). (Gregor Anich) --- include/GL/glut.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/GL/glut.h') diff --git a/include/GL/glut.h b/include/GL/glut.h index 3a67f1f560..7977dc94c9 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 */ -# 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 -- cgit v1.2.3