From 41ed8047d2cb13752676531aeaefa4bca1b1b0c1 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Sat, 15 May 2021 02:46:35 +0200 Subject: [PATCH] fix the @#$%@#$ build on macOS M1, again (re: 841c6800, c0fdc4a3) This commit excludes all Apple systems from the workaround. --- src/lib/libast/hash/hashalloc.c | 2 +- src/lib/libast/string/tokscan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/libast/hash/hashalloc.c b/src/lib/libast/hash/hashalloc.c index 00a290e9a..0791f3193 100644 --- a/src/lib/libast/hash/hashalloc.c +++ b/src/lib/libast/hash/hashalloc.c @@ -152,7 +152,7 @@ hashalloc(Hash_table_t* ref, ...) va_copy(*vp, ap); vp++; } -#if __clang__ && __SIZEOF_POINTER__ == 4 +#if __clang__ && __SIZEOF_POINTER__ == 4 && !__APPLE__ { va_list np; diff --git a/src/lib/libast/string/tokscan.c b/src/lib/libast/string/tokscan.c index d81dfbcd2..c1881eb2f 100644 --- a/src/lib/libast/string/tokscan.c +++ b/src/lib/libast/string/tokscan.c @@ -234,7 +234,7 @@ tokscan(register char* s, char** nxt, const char* fmt, ...) prv_f = f; f = va_arg(ap, char*); va_copy(prv_ap, ap); -#if __clang__ && __SIZEOF_POINTER__ == 4 +#if __clang__ && __SIZEOF_POINTER__ == 4 && !__APPLE__ { va_list np;