From 76bc795737ab6d0d45424ff50c3126fa60471a07 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 5 Aug 2019 16:49:40 +1200 Subject: [PATCH] Avoid multiple PFNGLXCREATECONTEXTATTRIBSARBPROC typedefs Move the compatibility typedef of PFNGLXCREATECONTEXTATTRIBSARBPROC back inside the conditional it is in for 3.0.x. Closes https://github.com/wxWidgets/wxWidgets/pull/1467 Closes #18324. --- src/unix/glx11.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/unix/glx11.cpp b/src/unix/glx11.cpp index 61c0a55f85..498e8f121c 100644 --- a/src/unix/glx11.cpp +++ b/src/unix/glx11.cpp @@ -69,11 +69,6 @@ #define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2 #endif -/* Typedef for the GL 3.0 context creation function */ -typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) - (Display * dpy, GLXFBConfig config, GLXContext share_context, - Bool direct, const int *attrib_list); - #ifndef GLX_ARB_create_context #define GLX_ARB_create_context #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 @@ -81,6 +76,11 @@ typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) #define GLX_CONTEXT_FLAGS_ARB 0x2094 #define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 + +/* Typedef for the GL 3.0 context creation function */ +typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) + (Display * dpy, GLXFBConfig config, GLXContext share_context, + Bool direct, const int *attrib_list); #endif #ifndef GLX_ARB_create_context_profile