[Intel-gfx] [PATCH 1/1] include xorg-server.h first for _XSERVER64

Maya Rashish coypu at sdf.org
Fri Sep 14 04:36:37 UTC 2018


Avoids error with defining conflicting types.
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ee588815..fc76e955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -495,10 +495,10 @@ if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$DRI1" != "xno" -a "x$U
         CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS"
         CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS"
         AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [have_dri1=no],
-                [/* for dri.h */
-                 #include <xf86str.h>
-                 /* for dristruct.h */
+                [/* for dristruct.h */
                  #include <xorg-server.h>
+                 /* for dri.h */
+                 #include <xf86str.h>
                  #ifdef HAVE_DRI_H
                  # include <dri.h>
                  #endif
-- 
2.18.0



More information about the Intel-gfx mailing list