From 103727f4125c389ff0e6e40319fd696880cafd4b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 27 Aug 2002 14:00:04 +0000 Subject: [PATCH] From Marco, fix to include/GL to clean up warnigns in Windows builds. --- include/osg/GL | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/osg/GL b/include/osg/GL index 0d6a7f844..ab48c0400 100644 --- a/include/osg/GL +++ b/include/osg/GL @@ -44,7 +44,8 @@ #ifndef APIENTRY #define GLUT_APIENTRY_DEFINED #if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) - #define APIENTRY __stdcall + #define WINAPI __stdcall + #define APIENTRY WINAPI #else #define APIENTRY #endif @@ -64,7 +65,8 @@ // XXX This is from Win32's and #ifndef WINGDIAPI #define GLUT_WINGDIAPI_DEFINED - #define WINGDIAPI __declspec(dllimport) + #define DECLSPEC_IMPORT __declspec(dllimport) + #define WINGDIAPI DECLSPEC_IMPORT #endif // XXX This is from Win32's #ifndef _WCHAR_T_DEFINED