xf86-video-ati: Branch 'master'

[Michel Dänzer]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f2915eb7a4beb6140ebec183aeac02111fc6ba77
Author: Christoph Haag <haagch at frickel.club>
Date:   Thu Mar 1 15:07:00 2018 +0100

    fix include order for present.h configure test
    
    xorg-server.h defines _XSERVER64 which is used in X.h to choose the
    correct definition of XID
    
    this prevents a failure in the present.h configure test that disables
    DRI3 on X.Org 1.20
    
    Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/configure.ac b/configure.ac
index a11ba2a4..6bf9671a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,8 +181,8 @@ AC_CHECK_HEADERS([misyncshm.h], [], [],
 AC_CHECK_HEADERS([present.h], [], [],
 		 [#include <X11/Xmd.h>
 		 #include <X11/Xproto.h>
-		 #include <X11/X.h>
-		 #include "xorg-server.h"])
+		 #include "xorg-server.h"
+		 #include <X11/X.h>])
 
 AC_CHECK_HEADERS([dri3.h], [], [],
 		 [#include <X11/Xmd.h>