From 7632a38c4e334f38e6c48a9ca7c3584b883b04c5 Mon Sep 17 00:00:00 2001 From: ikits Date: Mon, 3 Feb 2003 18:01:42 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@35 783a27ee-832a-0410-bc00-9f386506c6dd --- include/GL/glew.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/GL/glew.h b/include/GL/glew.h index e3e9d24..550b973 100644 --- a/include/GL/glew.h +++ b/include/GL/glew.h @@ -97,7 +97,7 @@ /* * GLEW does not include to avoid name space pollution. - * GL needs APIENTRY, GLU needs CALLBACK, wchar_t, and GL_API + * GL needs APIENTRY and WINGDIAPI, GLU needs CALLBACK, wchar_t, and GL_API * defined properly. */ /* */ @@ -123,17 +123,15 @@ # endif #endif /* and */ -//#ifndef WINGDIAPI -//#define GLEW_WINGDIAPI_DEFINED -//#define WINGDIAPI __declspec(dllimport) -//#endif +#ifndef WINGDIAPI +#define GLEW_WINGDIAPI_DEFINED +#define WINGDIAPI __declspec(dllimport) +#endif /* */ #ifndef _WCHAR_T_DEFINED typedef unsigned short wchar_t; #define _WCHAR_T_DEFINED #endif -/* */ -#define GLAPI extern /* * GLEW_STATIC needs to be set when including the @@ -154,12 +152,13 @@ typedef unsigned short wchar_t; #define GLEW_APIENTRY_DEFINED #define APIENTRY -#define GLAPI extern -#define GLAPIENTRY #define GLEW_EXPORT #endif /* _WIN32 */ +/* */ +#define GLAPI extern + #ifdef __cplusplus extern "C" { #endif @@ -4603,11 +4602,12 @@ extern GLEW_EXPORT const char* glewGetErrorString (GLint error); #undef CALLBACK #endif -//#ifdef GLEW_WINGDIAPI_DEFINED -//#undef GLEW_WINGDIAPI_DEFINED -//#undef WINGDIAPI -//#endif +#ifdef GLEW_WINGDIAPI_DEFINED +#undef GLEW_WINGDIAPI_DEFINED +#undef WINGDIAPI +#endif +#undef GL_API #undef GLEW_EXPORT #endif /* __glew_h__ */