From f27a38a213c5b5fb9dc2cf077eee2dc633754393 Mon Sep 17 00:00:00 2001 From: parasti Date: Tue, 15 Mar 2011 19:04:58 +0000 Subject: [PATCH] Define the glActiveTextureARB pointer type unconditionally (Cue incompatible type and redefined symbol conflicts.) git-svn-id: https://s.snth.net/svn/neverball/trunk@3526 78b8d119-cf0a-0410-b17c-f493084dd1d7 --- share/glext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/glext.h b/share/glext.h index 7a12b9e..732be1b 100644 --- a/share/glext.h +++ b/share/glext.h @@ -23,9 +23,9 @@ #ifndef GL_ARB_multitexture #define GL_TEXTURE0_ARB 0x84C0 #define GL_TEXTURE1_ARB 0x84C1 +#endif typedef void (*PFNGLACTIVETEXTUREARBPROC)(GLenum); -#endif extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB_; -- 1.7.9.5