[Valgrind-developers] [valgrind] Darwin: revert a bit of overzealous merging

[Paul F. <pa...@so...>]

https://sourceware.org/cgit/valgrind/commit/?id=acd5cb6c8d7d38c86103494a8c0f934da1d97f4a

commit acd5cb6c8d7d38c86103494a8c0f934da1d97f4a
Author: Paul Floyd <pj...@wa...>
Date:   Sat Dec 20 19:44:39 2025 +0100

    Darwin: revert a bit of overzealous merging

Diff:
---
 coregrind/fixup_macho_loadcmds.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/coregrind/fixup_macho_loadcmds.c b/coregrind/fixup_macho_loadcmds.c
index 0031177ee9..a6699baed4 100644
--- a/coregrind/fixup_macho_loadcmds.c
+++ b/coregrind/fixup_macho_loadcmds.c
@@ -117,18 +117,10 @@
 #include <mach-o/fat.h>
 #include <mach/i386/thread_status.h>
 
-/* Get hold of DARWIN_VERS, and check it has a sane value. */
+/* Check that DARWIN_VERS is defined */
 #include "config.h"
-#if DARWIN_VERS != DARWIN_10_5 && DARWIN_VERS != DARWIN_10_6 \
-    && DARWIN_VERS != DARWIN_10_7 && DARWIN_VERS != DARWIN_10_8 \
-    && DARWIN_VERS != DARWIN_10_9 && DARWIN_VERS != DARWIN_10_10 \
-    && DARWIN_VERS != DARWIN_10_11 && DARWIN_VERS != DARWIN_10_12 \
-    && DARWIN_VERS != DARWIN_10_13 && DARWIN_VERS != DARWIN_10_14 \
-    && DARWIN_VERS != DARWIN_10_15 && DARWIN_VERS != DARWIN_11_00 \
-    && DARWIN_VERS != DARWIN_12_00 && DARWIN_VERS != DARWIN_13_00 \
-    && DARWIN_VERS != DARWIN_14_00 && DARWIN_VERS != DARWIN_15_00 \
-    && DARWIN_VERS != DARWIN_15_04 && DARWIN_VERS != DARWIN_26_00
-#  error "Unknown DARWIN_VERS value.  This file only compiles on Darwin."
+#if !defined(DARWIN_VERS)
+#  error "DARWIN_VERS not defind. This file only compiles on Darwin."
 #endif
 
 
@@ -581,7 +573,7 @@ void modify_macho_loadcmds ( HChar* filename,
    seg__pagezero->vmaddr = 0;
 #  endif
 
-  out:
+  out:   
    if (ii.img)
       unmap_image(&ii);
 }