Move include of dlfcn.h to dlwrap.h

It only makes sense to make this header file pull in the underlying
dlfcn.h.

While in the area, also drop an unneeded include of GL/glext.h, (which
gets pulled in by GL/gl.h).

diff --git a/dlwrap.h b/dlwrap.h
index 9b6b53d8d062cf36c71512159272ff0b07e926e0..1dba14a9f569f03ac1f7b2e6f61ca4518838e470 100644 (file)
--- a/dlwrap.h
+++ b/dlwrap.h
@@ -22,6 +22,8 @@
 #ifndef DLWRAP_H
 #define DLWRAP_H
 
+#include <dlfcn.h>
+
 /* Call the *real* dlopen. We have our own wrapper for dlopen that, of
  * necessity must use claim the symbol 'dlopen'. So whenever anything
  * internal needs to call the real, underlying dlopen function, the

diff --git a/glxwrap.c b/glxwrap.c
index e4252d3942405d1209a6a529956d88092dfc44f9..80ccf1afdb6ed7148b81f1a04a30cd628b58b4da 100644 (file)
--- a/glxwrap.c
+++ b/glxwrap.c
@@ -21,12 +21,9 @@
 
 #include "fips.h"
 
-#include <dlfcn.h>
-
 #include <X11/Xlib.h>
 #include <GL/gl.h>
 #include <GL/glx.h>
-#include <GL/glext.h>
 
 #include <sys/time.h>