From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Wed, 3 Mar 2021 07:53:51 +0000 (+0100)
Subject: Keep on churning.
X-Git-Tag: VALGRIND_3_17_0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c136213d4618b717cda1d6932f707de1c7b3fd6c;p=thirdparty%2Fvalgrind.git

Keep on churning.

Without #define _XOPEN_SOURCE macports clang 9.0.1 on OSX 10.7.5 was
giving me

In file included from swapcontext.c:12:
/usr/include/ucontext.h:43:2: error: The deprecated ucontext routines require
      _XOPEN_SOURCE to be defined
 ^
swapcontext.

So I added #define _XOPEN_SOURCE

But that gives, on Solaris 11.3

In file included from /usr/include/limits.h:12:0,
                 from /usr/gcc/4.8/lib/gcc/i386-pc-solaris2.11/4.8.2/include-fixed/limits.h:168,
                 from /usr/gcc/4.8/lib/gcc/i386-pc-solaris2.11/4.8.2/include-fixed/syslimits.h:7,
                 from /usr/gcc/4.8/lib/gcc/i386-pc-solaris2.11/4.8.2/include-fixed/limits.h:34,
                 from swapcontext.c:7:
/usr/include/sys/feature_tests.h:354:2: error: #error "Compiler or options invalid for pre-UNIX 03 X/Open applications  and pre-2001 POSIX applications"
 #error "Compiler or options invalid for pre-UNIX 03 X/Open applications \
  ^

So make the #define _XOPEN_SOURCE conditional on darwin.
---

diff --git a/drd/tests/swapcontext.c b/drd/tests/swapcontext.c
index cf600d4933..622c70bc55 100644
--- a/drd/tests/swapcontext.c
+++ b/drd/tests/swapcontext.c
@@ -1,7 +1,11 @@
 /* See also https://bugs.kde.org/show_bug.cgi?id=432381. */
 
 #define _GNU_SOURCE
+
+#include "../../config.h"
+#if defined(VGO_darwin)
 #define _XOPEN_SOURCE
+#endif
 
 #include <assert.h>
 #include <limits.h>