[Valgrind-developers] [valgrind] s390x: Header file tweak

[Florian K. <fk...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=c069c7a8cfbb90f5dbab915da78aa986743b1295

commit c069c7a8cfbb90f5dbab915da78aa986743b1295
Author: Florian Krohm <fl...@ei...>
Date:   Sat Mar 15 16:51:00 2025 +0000

    s390x: Header file tweak
    
    Thou shalt write header files in a way that they are compilable
    entities on their own.

Diff:
---
 VEX/priv/guest_s390_defs.h         | 1 +
 none/tests/s390x/disasm-test/vex.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
index a64d563ec9..607773ad14 100644
--- 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 fa7b48b7c3..a1847b42b5 100644
--- 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