diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2020-09-15 11:38:55 +0200 |
|---|---|---|
| committer | Michel Dänzer <mdaenzer@redhat.com> | 2020-09-15 11:38:55 +0200 |
| commit | 0ce93e5ba774a53459bac8c23016c5d3232038eb (patch) | |
| tree | 46cf7191f75c96e1dd2ab9e075b21353e7b7fa29 /dri3 | |
| parent | 97f858d336a85cb49de6275918793c773d5d9db1 (diff) | |
dri3: Include dix-config.h instead of xorg-config.h
This is DIX code.
Diffstat (limited to 'dri3')
| -rw-r--r-- | dri3/Makefile.am | 3 | ||||
| -rw-r--r-- | dri3/dri3.c | 4 | ||||
| -rw-r--r-- | dri3/dri3_priv.h | 1 | ||||
| -rw-r--r-- | dri3/dri3_request.c | 4 | ||||
| -rw-r--r-- | dri3/dri3_screen.c | 4 | ||||
| -rw-r--r-- | dri3/meson.build | 1 |
6 files changed, 2 insertions, 15 deletions
diff --git a/dri3/Makefile.am b/dri3/Makefile.am index e47a734e0..99c3718a5 100644 --- a/dri3/Makefile.am +++ b/dri3/Makefile.am @@ -1,7 +1,6 @@ noinst_LTLIBRARIES = libdri3.la AM_CFLAGS = \ - -DHAVE_XORG_CONFIG_H \ - @DIX_CFLAGS@ @XORG_CFLAGS@ + @DIX_CFLAGS@ libdri3_la_SOURCES = \ dri3.h \ diff --git a/dri3/dri3.c b/dri3/dri3.c index ba32facd7..191252969 100644 --- a/dri3/dri3.c +++ b/dri3/dri3.c @@ -20,10 +20,6 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #include "dri3_priv.h" #include <drm_fourcc.h> diff --git a/dri3/dri3_priv.h b/dri3/dri3_priv.h index b087a9529..f319d1770 100644 --- a/dri3/dri3_priv.h +++ b/dri3/dri3_priv.h @@ -23,6 +23,7 @@ #ifndef _DRI3PRIV_H_ #define _DRI3PRIV_H_ +#include "dix-config.h" #include <X11/X.h> #include "scrnintstr.h" #include "misc.h" diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c index 958877efa..687168930 100644 --- a/dri3/dri3_request.c +++ b/dri3/dri3_request.c @@ -20,10 +20,6 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #include "dri3_priv.h" #include <syncsrv.h> #include <unistd.h> diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c index b98259753..3c7e5bf60 100644 --- a/dri3/dri3_screen.c +++ b/dri3/dri3_screen.c @@ -20,10 +20,6 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - #include "dri3_priv.h" #include <syncsdk.h> #include <misync.h> diff --git a/dri3/meson.build b/dri3/meson.build index 48ce0d9d6..d446fdda7 100644 --- a/dri3/meson.build +++ b/dri3/meson.build @@ -14,7 +14,6 @@ if build_dri3 srcs_dri3, include_directories: inc, dependencies: [ common_dep, libdrm_dep ], - c_args: '-DHAVE_XORG_CONFIG_H' ) endif |