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

This is DIX code.
2020-09-15 11:41:34 +02:00 · 2020-09-15 11:41:34 +02:00 · 62d8c1cc69
parent 0ce93e5ba7
commit 62d8c1cc69
14 changed files with 2 additions and 47 deletions
--- 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 \
--- 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)
--- 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>

--- 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;
--- 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"

 /*
--- 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"

--- 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>
--- 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"

 /*
--- 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"
--- 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>
--- 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>
--- 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;
--- 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
--- 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"

 /*