From 03d462ddd2cacce92dc9e6bad00710d899509387 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 2 Oct 2014 12:04:20 +0100 Subject: [PATCH] hw/xwin: Fix warnings in glx/glshim.c glext.h currently requires GL_GLEXT_PROTOTYPES in order to prototype glCompressedTexImmage* functions generated_gl_shim.c:2859:6: warning: no previous prototype for 'glCompressedTexImage3DARB' [-Wmissing-prototypes] generated_gl_shim.c:2866:6: warning: no previous prototype for 'glCompressedTexImage2DARB' [-Wmissing-prototypes] generated_gl_shim.c:2873:6: warning: no previous prototype for 'glCompressedTexImage1DARB' [-Wmissing-prototypes] generated_gl_shim.c:2880:6: warning: no previous prototype for 'glCompressedTexSubImage3DARB' [-Wmissing-prototypes] generated_gl_shim.c:2887:6: warning: no previous prototype for 'glCompressedTexSubImage2DARB' [-Wmissing-prototypes] generated_gl_shim.c:2894:6: warning: no previous prototype for 'glCompressedTexSubImage1DARB' [-Wmissing-prototypes] generated_gl_shim.c:2901:6: warning: no previous prototype for 'glGetCompressedTexImageARB' [-Wmissing-prototypes] Also, explicitly prototype glXGetProcAddressARB(), as glx/glxdri*.c does, as it's not practical to include glx.h here... Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/glx/glshim.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/xwin/glx/glshim.c b/hw/xwin/glx/glshim.c index 7109196c0..df5a932ff 100644 --- a/hw/xwin/glx/glshim.c +++ b/hw/xwin/glx/glshim.c @@ -36,6 +36,7 @@ #endif #define GL_GLEXT_LEGACY +#define GL_GLEXT_PROTOTYPES #include #undef GL_ARB_imaging #undef GL_VERSION_1_3 @@ -46,6 +47,8 @@ #include "glwindows.h" #include +extern void *glXGetProcAddressARB(const char *); + static HMODULE hMod = NULL; /*