Adjust X11 include ordering.

Some versions of Motif require <X11/Intrinsic.h> to be included before
<Xm/XmStrDefs.h> which results in build failures on HP-UX.

diff --git a/src/motif.h b/src/motif.h
index ae6631d173b27b87d1590b60acf4b447878f597b..171739d9e1fcb0e804ba4ee0173542b64548754f 100644 (file)
--- a/src/motif.h
+++ b/src/motif.h
@@ -20,7 +20,6 @@
 #define RRACE_MOTIF_H_
 
 #include <inttypes.h>
-#include <X11/Intrinsic.h>
 #include "game.h"
 
 enum { COLOUR_PRIMARY, COLOUR_DARK, COLOUR_LIGHT, COLOUR_MAX };

diff --git a/src/x11.c b/src/x11.c
index 598b11542fd3705772bd603fcece267bb8298a3f..94a0619b473a2d6d27b48011f48b0dfc597acf9e 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -19,6 +19,8 @@
 #include <config.h>
 #include <stdio.h>
 #include <assert.h>
+
+#include <X11/Intrinsic.h>
 #include <Xm/XmStrDefs.h>
 #include "motif.h"