From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Mon, 20 Nov 2023 21:28:43 +0000 (+0100)
Subject: Darwin: another csrctl change
X-Git-Tag: VALGRIND_3_23_0~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99d63f21c71789db5e5fda0b4914d71d2afe65de;p=thirdparty%2Fvalgrind.git

Darwin: another csrctl change

Still getting asserts on x86 probably due to 64 bit arguments
(none of the Darwin syscalls are split into x86 / amd64 with
MERGEs for x86).
---

diff --git a/include/vki/vki-darwin.h b/include/vki/vki-darwin.h
index 9d0e2f04fa..392558fc89 100644
--- a/include/vki/vki-darwin.h
+++ b/include/vki/vki-darwin.h
@@ -1122,7 +1122,7 @@ typedef int vki_errno_t;
 
 /* necp stuff.  This doesn't appear to exist in any user space include
    file. */
-#if DARWIN_VERS == DARWIN_10_10
+#if DARWIN_VERS >= DARWIN_10_10
 struct vki_necp_aggregate_result {
    vki_u_int32_t field1;
    unsigned int  field2;