x21

glx/extension_string.c

@@ -30,8 +30,8 @@
  *
  * \author Ian Romanick <idr@us.ibm.com>
  */
+#include <dix-config.h>
 
-#include "dix-config.h"
 #include "extension_string.h"
 #include "opaque.h"
 

glx/glxbyteorder.h

@@ -31,10 +31,6 @@
 #if !defined(__GLXBYTEORDER_H__)
 #define __GLXBYTEORDER_H__
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "misc.h"
 
 #endif                          /* !defined(__GLXBYTEORDER_H__) */

glx/indirect_dispatch_swap.c

@@ -24,6 +24,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <dix-config.h>
 
 #include <inttypes.h>
 #include "glxserver.h"

hw/xfree86/sdk/meson.build

@@ -33,7 +33,7 @@ if build_xv
 endif
 
 if build_glamor
-    xorg_sdk_headers += '../glamor/glamor.h'
+    xorg_sdk_headers += '../../../glamor/glamor.h'
 endif
 
 if build_xorg_sdk