From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <iains@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1698)
 id 2D6393829BD4; Sun, 29 May 2022 19:14:35 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D6393829BD4
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Iain D Sandoe <iains@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r10-10801] libstdc++, testsuite,
 Darwin : Adjust for names used in system headers.
X-Act-Checkin: gcc
X-Git-Author: Iain Sandoe <iain@sandoe.co.uk>
X-Git-Refname: refs/heads/releases/gcc-10
X-Git-Oldrev: 1badc4b94e430e3cbf854d99fd30c7f2e0ec6e86
X-Git-Newrev: 3b0ee45cf6babc77c1a744660b23b497346705eb
Message-Id: <20220529191435.2D6393829BD4@sourceware.org>
Date: Sun, 29 May 2022 19:14:35 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 May 2022 19:14:35 -0000

https://gcc.gnu.org/g:3b0ee45cf6babc77c1a744660b23b497346705eb

commit r10-10801-g3b0ee45cf6babc77c1a744660b23b497346705eb
Author: Iain Sandoe <iain@sandoe.co.uk>
Date:   Mon Mar 15 00:34:27 2021 +0000

    libstdc++, testsuite, Darwin : Adjust for names used in system headers.
    
    For all current Darwin SDKs inttypes.h has:
    extern intmax_t imaxabs(intmax_t j);
    
    So we need to exclude j from the defined test symbols.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/17_intro/names.cc: Exclude j from the list
            of test symbols for Darwin.
    
    (cherry picked from commit 6f4b0ff2b1fbd58669ae130387c7535110300c52)

Diff:
---
 libstdc++-v3/testsuite/17_intro/names.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index a5642df8666..5170a714b93 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -201,6 +201,11 @@
 #undef func
 #endif
 
+#ifdef __APPLE__
+// inttypes.h:  extern intmax_t imaxabs(intmax_t j);
+#undef j
+#endif
+
 #ifdef __hpux__
 #undef d
 #undef r