From: Nick Bowler <nbowler@draconx.ca>
Date: Sat, 5 Mar 2022 21:35:39 +0000 (-0500)
Subject: Adjust X11 include ordering.
X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/commitdiff_plain/44fbf97825db6918cc7f4e31189f689ba7270128

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 ae6631d..171739d 100644
--- 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 598b115..94a0619 100644
--- 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"