Merge f45c019265 into d403cbd25c

glx/glxcontext.h

@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_context_h_
 #define _GLX_context_h_
 

glx/glxdrawable.h

@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_drawable_h_
 #define _GLX_drawable_h_
 

glx/glxext.h

@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _glxext_h_
 #define _glxext_h_
 

glx/glxscreens.h

@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_screens_h_
 #define _GLX_screens_h_
 

glx/glxserver.h

@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_server_h_
 #define _GLX_server_h_
 

glx/glxutil.h

@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _glxcmds_h_
 #define _glxcmds_h_
 

glx/indirect_table.c

@@ -22,6 +22,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <dix-config.h>
 
 #include <inttypes.h>
 #include "glxserver.h"

glx/singlesize.h

@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _singlesize_h_
 #define _singlesize_h_
 

glx/unpack.h

@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef __GLX_unpack_h__
 #define __GLX_unpack_h__
 

glx/vndserver_priv.h

@@ -26,11 +26,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  */
-
 #ifndef _XSERVER_VNDSERVER_PRIV_H
 #define _XSERVER_VNDSERVER_PRIV_H
 
-#include <dix-config.h>
 #include "glxvndabi.h"
 #include "vndserver.h"
 

glx/vndservervendor.h

@@ -26,12 +26,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  */
-
 #ifndef VND_SERVER_VENDOR_H
 #define VND_SERVER_VENDOR_H
 
-#include <dix-config.h>
-
 #include "glxvndabi.h"
 #include "list.h"