present: Include dix-config.h instead of xorg-config.h

This is DIX code.

14 files changed, 2 insertions, 47 deletions

diff --git a/present/Makefile.am b/present/Makefile.am
index 542f4ca9c..269bd5db5 100644
--- a/present/Makefile.am
+++ b/present/Makefile.am
@@ -1,7 +1,6 @@
 noinst_LTLIBRARIES = libpresent.la
 AM_CFLAGS = \
-	-DHAVE_XORG_CONFIG_H \
-	@DIX_CFLAGS@ @XORG_CFLAGS@
+	@DIX_CFLAGS@
 
 libpresent_la_SOURCES = \
 	present.h \
diff --git a/present/meson.build b/present/meson.build
index 3dc1fc04b..026ccf90a 100644
--- a/present/meson.build
+++ b/present/meson.build
@@ -24,7 +24,6 @@ libxserver_present = static_library('libxserver_present',
         common_dep,
         dependency('presentproto', version: '>= 1.2')
     ],
-    c_args: '-DHAVE_XORG_CONFIG_H'
 )
 
 install_data(hdrs_present, install_dir: xorgsdkdir)
diff --git a/present/present.c b/present/present.c
index 43581e378..217fe1d7a 100644
--- a/present/present.c
+++ b/present/present.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 #include <gcstruct.h>
 
diff --git a/present/present_event.c b/present/present_event.c
index 9aebfdfce..435b26b70 100644
--- a/present/present_event.c
+++ b/present/present_event.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 
 static RESTYPE present_event_type;
diff --git a/present/present_execute.c b/present/present_execute.c
index 58066db86..68a5878be 100644
--- a/present/present_execute.c
+++ b/present/present_execute.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 
 /*
diff --git a/present/present_fake.c b/present/present_fake.c
index 2350638ea..75e2508ba 100644
--- a/present/present_fake.c
+++ b/present/present_fake.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 #include "list.h"
 
diff --git a/present/present_fence.c b/present/present_fence.c
index 87e7e17d8..aca04a580 100644
--- a/present/present_fence.c
+++ b/present/present_fence.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 #include <gcstruct.h>
 #include <misync.h>
diff --git a/present/present_notify.c b/present/present_notify.c
index e272e08dc..445954998 100644
--- a/present/present_notify.c
+++ b/present/present_notify.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 
 /*
diff --git a/present/present_priv.h b/present/present_priv.h
index bce67b21e..eb0c20fbb 100644
--- a/present/present_priv.h
+++ b/present/present_priv.h
@@ -23,6 +23,7 @@
 #ifndef _PRESENT_PRIV_H_
 #define _PRESENT_PRIV_H_
 
+#include "dix-config.h"
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include "misc.h"
diff --git a/present/present_request.c b/present/present_request.c
index f52efa52b..f3e5679b5 100644
--- a/present/present_request.c
+++ b/present/present_request.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 #include "randrstr.h"
 #include <protocol-versions.h>
diff --git a/present/present_scmd.c b/present/present_scmd.c
index c7184e793..123e95cae 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 #include <misync.h>
 #include <misyncstr.h>
diff --git a/present/present_screen.c b/present/present_screen.c
index 6efe3b3a2..05a810f5e 100644
--- a/present/present_screen.c
+++ b/present/present_screen.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 
 int present_request;
diff --git a/present/present_vblank.c b/present/present_vblank.c
index af14fe134..3c3f3ca1c 100644
--- a/present/present_vblank.c
+++ b/present/present_vblank.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 
 void
diff --git a/present/present_wnmd.c b/present/present_wnmd.c
index 3f78f02a0..7d1000a01 100644
--- a/present/present_wnmd.c
+++ b/present/present_wnmd.c
@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "present_priv.h"
 
 /*