From 88037d82d7646d8b04d5940f06e882b3778b7aec Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 26 Oct 2021 14:00:18 +0200 Subject: [PATCH] libstdc++: Fix 17_intro/names.cc on Solaris 17_intro/names.cc and experimental/names.cc currently FAIL on Solaris FAIL: 17_intro/names.cc (test for excess errors) FAIL: experimental/names.cc (test for excess errors) Excess errors: /usr/include/sys/timespec_util.h:22: error: expected ')' before ';' token /usr/include/stdlib.h:157: error: expected unqualified-id before '[' token /usr/include/stdlib.h:157: error: expected ')' before '[' token has extern int timespeccompare(const struct timespec *l, const struct timespec *r); while has typedef struct drand48_data { unsigned int _initialised; unsigned short int x[3]; unsigned short int a[3]; unsigned int c; unsigned short lastx[3]; } drand48_data; both of which are broken by defining r resp. x to ( in the testcase. Fixed by undoing the defines. Tested on i386-pc-solaris2.11, sparc-sun-solaris2.11, and x86_64-pc-linux-gnu. 2021-10-20 Rainer Orth libstdc++-v3: * testsuite/17_intro/names.cc [__sun__] (r, x): Undef. --- libstdc++-v3/testsuite/17_intro/names.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index b5e926fb09fe..2a908ea9fc5e 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -251,6 +251,10 @@ #undef p // See https://gcc.gnu.org/ml/libstdc++/2019-05/msg00175.html #undef ptr +// uses this as parameter +#undef r +// uses this as member of drand48_data +#undef x #endif #ifdef __VXWORKS__ -- 2.47.2