From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1147) id A97A23858010; Tue, 26 Oct 2021 12:05:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A97A23858010 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Rainer Orth To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4709] libstdc++: Fix 17_intro/names.cc on Solaris X-Act-Checkin: gcc X-Git-Author: Rainer Orth X-Git-Refname: refs/heads/master X-Git-Oldrev: de185d7176795b84f9d23f921442fddce8dfdd9a X-Git-Newrev: 88037d82d7646d8b04d5940f06e882b3778b7aec Message-Id: <20211026120551.A97A23858010@sourceware.org> Date: Tue, 26 Oct 2021 12:05:51 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2021 12:05:51 -0000 https://gcc.gnu.org/g:88037d82d7646d8b04d5940f06e882b3778b7aec commit r12-4709-g88037d82d7646d8b04d5940f06e882b3778b7aec Author: Rainer Orth Date: Tue Oct 26 14:00:18 2021 +0200 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. Diff: --- 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 b5e926fb09f..2a908ea9fc5 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__