s390x: Header file tweak

Thou shalt write header files in a way that they are compilable
entities on their own.

diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
index a64d563ec9e69a4fe9789db155e860e29fb1850c..607773ad14aac14be592a7006fe1f6ae3bdcfbf8 100644 (file)
--- a/VEX/priv/guest_s390_defs.h
+++ b/VEX/priv/guest_s390_defs.h
@@ -34,6 +34,7 @@
 #include "libvex_basictypes.h"        // offsetof
 #include "guest_generic_bb_to_IR.h"   // DisResult
 #include "libvex_guest_s390x.h"       // VexGuestS390XState
+#include "main_util.h"                // STATIC_ASSERT
 
 
 /* Convert one s390 insn to IR.  See the type DisOneInstrFn in

diff --git a/none/tests/s390x/disasm-test/vex.c b/none/tests/s390x/disasm-test/vex.c
index fa7b48b7c3c04d1521c41ce4f63eef59312b06a6..a1847b42b54374c7dda20be92e8bb20f0ad12427 100644 (file)
--- a/none/tests/s390x/disasm-test/vex.c
+++ b/none/tests/s390x/disasm-test/vex.c
@@ -24,7 +24,6 @@
 
 #include "libvex_ir.h"        // emptyIRSB
 #include "libvex.h"           // LibVEX_Init
-#include "main_util.h"        // GRRR for guest_s390_defs.h which needs STATIC_ASSERT
 #include "guest_s390_defs.h"  // disInstr_S390
 #include "host_s390_defs.h"   // s390_host_hwcaps
 #include "main_globals.h"     // vex_traceflags