drop obsolete HAVE_DIX_CONFIG_H

The symbol controls whether to include dix-config.h, and it's always set,
thus we don't need it (and dozens of ifdef's) anymore.

This commit only removes them from our own source files, where we can
guarantee that dix-config.h is present - leaving the (potentially exported)
headers untouched.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

24 files changed, 0 insertions, 48 deletions

diff --git a/glx/clientinfo.c b/glx/clientinfo.c
index 74ad91991..3dcabf844 100644
--- a/glx/clientinfo.c
+++ b/glx/clientinfo.c
@@ -20,9 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "indirect_dispatch.h"
diff --git a/glx/createcontext.c b/glx/createcontext.c
index 37d14fe99..185bd6bb2 100644
--- a/glx/createcontext.c
+++ b/glx/createcontext.c
@@ -20,9 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <GL/glxtokens.h>
 #include "glxserver.h"
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 64dcd6b81..ab1ed6410 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 #include <assert.h>
diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c
index 7d6674470..59ce663b7 100644
--- a/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 #include "glxserver.h"
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index bb557fb7d..c4e02b7b7 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -21,9 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index 35a539629..0d83fa714 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -23,9 +23,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <ctype.h>
 #include <stdint.h>
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index c57d80db7..ac657d6f8 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -24,9 +24,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/glx/glxext.c b/glx/glxext.c
index 585f64eda..467fdd542 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 #include "glxserver.h"
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index e766e2579..ef969fcd6 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <GL/glxtokens.h>
 #include <string.h>
diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index c7bfa03ca..c0c7ae898 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -29,9 +29,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "glxbyteorder.h"
diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 6d25bcd04..c82bc1cb7 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -23,9 +23,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "glxbyteorder.h"
diff --git a/glx/indirect_util.c b/glx/indirect_util.c
index ba180b0cc..d91ec5d61 100644
--- a/glx/indirect_util.c
+++ b/glx/indirect_util.c
@@ -23,9 +23,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 
diff --git a/glx/render2.c b/glx/render2.c
index 8d9b5f4d2..5d126eeca 100644
--- a/glx/render2.c
+++ b/glx/render2.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <glxserver.h>
 #include "unpack.h"
diff --git a/glx/render2swap.c b/glx/render2swap.c
index 6ed364f75..243dd0fed 100644
--- a/glx/render2swap.c
+++ b/glx/render2swap.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "unpack.h"
diff --git a/glx/renderpix.c b/glx/renderpix.c
index 91ba91187..958f699c1 100644
--- a/glx/renderpix.c
+++ b/glx/renderpix.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "unpack.h"
diff --git a/glx/renderpixswap.c b/glx/renderpixswap.c
index a4cb246bb..322dc7e86 100644
--- a/glx/renderpixswap.c
+++ b/glx/renderpixswap.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "unpack.h"
diff --git a/glx/rensize.c b/glx/rensize.c
index 55ad4a2af..821c6b3fb 100644
--- a/glx/rensize.c
+++ b/glx/rensize.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <GL/gl.h>
 #include "glxserver.h"
diff --git a/glx/single2.c b/glx/single2.c
index 36a01f0cb..7c9e24549 100644
--- a/glx/single2.c
+++ b/glx/single2.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <string.h>
 #include <stdio.h>
diff --git a/glx/single2swap.c b/glx/single2swap.c
index b140946ba..b7c7c00da 100644
--- a/glx/single2swap.c
+++ b/glx/single2swap.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "glxutil.h"
diff --git a/glx/singlepix.c b/glx/singlepix.c
index e1bed19aa..95dbf51e7 100644
--- a/glx/singlepix.c
+++ b/glx/singlepix.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "glxext.h"
diff --git a/glx/singlepixswap.c b/glx/singlepixswap.c
index 8e4d9bddf..0e2779145 100644
--- a/glx/singlepixswap.c
+++ b/glx/singlepixswap.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "glxext.h"
diff --git a/glx/singlesize.c b/glx/singlesize.c
index 4c60b6920..344ffef7f 100644
--- a/glx/singlesize.c
+++ b/glx/singlesize.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <GL/gl.h>
 #include "glxserver.h"
diff --git a/glx/swap_interval.c b/glx/swap_interval.c
index 232055080..2f1b02cf7 100644
--- a/glx/swap_interval.c
+++ b/glx/swap_interval.c
@@ -22,9 +22,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "glxserver.h"
 #include "glxutil.h"
diff --git a/glx/xfont.c b/glx/xfont.c
index bd090cb15..3e84369e8 100644
--- a/glx/xfont.c
+++ b/glx/xfont.c
@@ -28,9 +28,7 @@
  * Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "dix/dix_priv.h"