From patchwork Sun Dec 17 00:03:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 179931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp475118dyi; Sat, 16 Dec 2023 16:04:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNsqTT6ydJ1kbxQlmx4eyWwDGC53zSytJs4l0qPtjfYW58UCuhaqM55nlH+3DGO5LmHzdO X-Received: by 2002:a05:622a:1a10:b0:425:4043:8d65 with SMTP id f16-20020a05622a1a1000b0042540438d65mr14483998qtb.128.1702771449172; Sat, 16 Dec 2023 16:04:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702771449; cv=pass; d=google.com; s=arc-20160816; b=IBal0NfaM4qRsOX6gUyrltu1bLZRCznNJZumTgb26axlVBSD9PhgIaQrs2gB3kylEm PuR/0JzXvmmDGnf36142ZfKaRObiKgLgnh9ijrjCFtNyA1ICVchhVmdNuBcLMVFVVcm+ H5TcMswzGkrpHP4vDQXgXRiaexiAhBsAYsDklWU/67sn9x9bsXiCJHvWxT8yb6jYnWlv W0zhwxtH0vHBczNY+FdaYHL/w4xvn4+/CLOf7EWE45Rjbv28KAe0OfEzL5mnKXCB0Brj vzN023om104MW7tYxlyRrTwxvWOisiiqaD2ItJQaFZdbEcgBJScsF2sP2PFqI6leclPY VRMw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=Xe2lrkGrCPI1ka4a8vRVSdE2nq9/VOEfd4z1OVwibHE=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=EoA5A8i11zgznw5hoZWUL6lraKPtMwI7CnNaY1XACeNODRIDHt0Mbq+bnaD+BZXXUB JdCJ2KLhvxwMB1/otTpBrIe9IqkcyfyHm3jwx/PFTd72YpDjgsWw8+DhEmoIzOPCq107 EMU6yjUuyyodW0HrIhHkf2PvH1CUsUCtxqsOmiC0VRNAlWbQwXhRCcKN/MJRV9kzubZh vn87yprhu4FHIoD+r2JZJ/xPAK88qYsYdpfIb0gOCchGdfgJmZSDc4jHeBDYN2/N35aj uuHhEY53pv0ZbkwTZmEstu55GeheK7F56a1OMkxOts2ffa8EI5Gzr0dfplzXVzDqgcW2 2yBQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=adkAzyGY; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id bb21-20020a05622a1b1500b0042550288bdfsi22332666qtb.29.2023.12.16.16.04.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 16:04:09 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=adkAzyGY; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DD4C23857B92 for ; Sun, 17 Dec 2023 00:04:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id A839C38582B5 for ; Sun, 17 Dec 2023 00:03:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A839C38582B5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A839C38582B5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702771426; cv=none; b=qs7e1iGEzgpDw/BpVFK3bnE7x28C9XzOEkzlDQ0CNkgv7A2TFLUmRPE03shHbp+frh0pfV2J4lFurXTi6FaSiwP7oTmLAgy/ST+B4UaC8/D9M5xHKR5aK7sErCyCKJXsI7c5Z8+sH/GFAlLFNEi3T38kXUdA5+57G9kmP9g2yvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702771426; c=relaxed/simple; bh=xs2UxrVs55DJ7ZBRcO07F+tJEQRYfLvAAX0x0W1MB2w=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=O3/m7qe4W2bzb+vk3xg0icMBbFFGnpF+Vrr4XnvZQtcA7FLnHGV9BAFfLJSELP0FIF7fFluvn1e7BDycOE55rzs2yv+HITKxpLy79UX8V7yVpjHua1vGATHxmFdRyDi+jvIumlaU7rCl85wLdSwkn8dSIuCKWtraS/tQTU7Xs/U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702771425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xe2lrkGrCPI1ka4a8vRVSdE2nq9/VOEfd4z1OVwibHE=; b=adkAzyGYNZeHVUCs958b/SKuVvaXlq3KaV3pH4DejEBYQBgMaiE+hjN1TZ1YKQWoE1GNW8 UrfHyxgXIR0v7tHuS1W3Yl6vUX6019RIK7QwYPEalAU0dsBePm9tBgPv7U5DeCQOY/uVlY PAV0/M0zx9INJNNd7K+C3MP3jGOxhZA= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-77MpSZXmPyGm64ckstfsOg-1; Sat, 16 Dec 2023 19:03:42 -0500 X-MC-Unique: 77MpSZXmPyGm64ckstfsOg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E00D83C0BE2B; Sun, 17 Dec 2023 00:03:41 +0000 (UTC) Received: from localhost (unknown [10.42.28.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB3EA1C060B1; Sun, 17 Dec 2023 00:03:41 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix bootstrap on AIX due to fileno macro Date: Sun, 17 Dec 2023 00:03:24 +0000 Message-ID: <20231217000341.2325821-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785485274822506791 X-GMAIL-MSGID: 1785485274822506791 Tested x86_64-linux (and built on AIX). Pushed to trunk. -- >8 -- On AIX fileno is a function-like macro, so enclose the name in parentheses to ensure we use the real function. libstdc++-v3/ChangeLog: * src/c++23/print.cc (__open_terminal(FILE*)): Avoid fileno macro. --- libstdc++-v3/src/c++23/print.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/src/c++23/print.cc b/libstdc++-v3/src/c++23/print.cc index d72ab856017..be9762bbfdc 100644 --- a/libstdc++-v3/src/c++23/print.cc +++ b/libstdc++-v3/src/c++23/print.cc @@ -76,7 +76,7 @@ namespace if (int fd = ::_fileno(f); fd >= 0) return check_for_console((void*)_get_osfhandle(fd)); #elifdef _GLIBCXX_HAVE_UNISTD_H - if (int fd = ::fileno(f); fd >= 0 && ::isatty(fd)) + if (int fd = (::fileno)(f); fd >= 0 && ::isatty(fd)) return f; #endif }