From 307a9a9a7869c30fa2fffc19366b9fd11511d2dd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 3 Apr 2007 19:42:43 +0000 Subject: [PATCH] From Andy Skinner, warning fix for Windows 64-bit build --- include/osg/GL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/osg/GL b/include/osg/GL index 7e6768176..78fc3a8fc 100644 --- a/include/osg/GL +++ b/include/osg/GL @@ -39,7 +39,7 @@ #define GLUT_APIENTRY_DEFINED #define APIENTRY __stdcall #endif - // XXX This is from Win32's + // XXX This is from Win32's #ifndef CALLBACK #define CALLBACK __stdcall #endif @@ -60,9 +60,9 @@ #endif #endif - // XXX This is from Win32's + // XXX This is from Win32's #ifndef CALLBACK - #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS) + #if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) #define CALLBACK __stdcall #else #define CALLBACK