X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxwrap.c;h=84bf48522565e489de274cd87e752d5a470ebd01;hb=ca92cd15c67e52a9ed2d390f946b750e777b47d7;hp=6da42e6622abf2a613f373e5db2ef0014c9d80bc;hpb=377222f13763b1b7b78bf558ab9ac8b70535c96d;p=fips

diff --git a/glxwrap.c b/glxwrap.c
index 6da42e6..84bf485 100644
--- a/glxwrap.c
+++ b/glxwrap.c
@@ -45,24 +45,15 @@ glXSwapBuffers (Display *dpy, GLXDrawable drawable)
  */
 void (*glXGetProcAddressARB (const GLubyte *func))(void)
 {
-	void *ptr;
-	static typeof(&glXGetProcAddressARB) glxwrap_real_glXGetProcAddressARB = NULL;
-	char *name = "glXGetProcAddressARB";
-
-	if (! glxwrap_real_glXGetProcAddressARB) {
-		glxwrap_real_glXGetProcAddressARB = glwrap_lookup (name);
-		if (! glxwrap_real_glXGetProcAddressARB) {
-			fprintf (stderr, "Error: Failed to find function %s.\n",
-				 name);
-			return NULL;
-		}
-	}
+	void *ret;
 
 	/* If our library has this symbol, that's what we want to give. */
-	ptr = dlwrap_real_dlsym (NULL, (const char *) func);
-	if (ptr)
-		return ptr;
+	ret = dlwrap_real_dlsym (NULL, (const char *) func);
+	if (ret)
+		return ret;
 
 	/* Otherwise, just defer to the real glXGetProcAddressARB. */
-	return glxwrap_real_glXGetProcAddressARB (func);
+	GLWRAP_DEFER_WITH_RETURN (ret, glXGetProcAddressARB, func);
+
+	return ret;
 }