From patchwork Sat Dec 2 20:27:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 81207 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 29262385782D for ; Sat, 2 Dec 2023 20:27:30 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id A78763858D33 for ; Sat, 2 Dec 2023 20:27:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A78763858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A78763858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701548838; cv=none; b=Xx7ukHfEiSijfhuj+7CwY0FctZfUHgGqOt5yDKaEHzlajfpd8zd/9X0AG0ORUX8YKwW1SiLBnY2peI80GXlQrbnBRcJiqDuchLi6dy/uzDiAgkiA9kL+oBOCNxOgI5RuA/JBHt+ZpUJMgst+4ZV/pdpNMUes8esbgPeweZPHKPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701548838; c=relaxed/simple; bh=XuIins+91fT6DPzfqf9l9JjArBIB1GICVE4KDyUCi1g=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=exeTIpih+Im4jrzThbhREDkNAyYZrhqkWhdrSTZEPtjDm8mDGNNX+olStHQ6nRYAgcShLQRWcT+9i+vGnQa8bcP/byaZlMYMrQXTqa3a0b4a0p4nelN3NNmhfw3IdYXPEeoD/Mp5m4eRGHUONt+REraOoFHY/reD0BDY33y3Ilg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 507A72011A; Sat, 2 Dec 2023 21:27:16 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TkvSm1GzLIOH; Sat, 2 Dec 2023 21:27:16 +0100 (CET) Received: from begin (aamiens-653-1-111-57.w83-192.abo.wanadoo.fr [83.192.234.57]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 3A0DF20107; Sat, 2 Dec 2023 21:27:16 +0100 (CET) Received: from samy by begin with local (Exim 4.97) (envelope-from ) id 1r9Wa3-00000004WJo-35iV; Sat, 02 Dec 2023 21:27:15 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] hurd: [!__USE_MISC] Do not #undef BSD macros in ioctls Date: Sat, 2 Dec 2023 21:27:12 +0100 Message-ID: <20231202202712.1077537-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org When e.g. including termios.h first and then sys/ioctl.h, without e.g. _BSD_SOURCE, the latter would #undef e.g. ECHO, without defining it. --- sysdeps/mach/hurd/bits/ioctls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h index 943d5e4287..1b2fd6b33f 100644 --- a/sysdeps/mach/hurd/bits/ioctls.h +++ b/sysdeps/mach/hurd/bits/ioctls.h @@ -25,6 +25,7 @@ /* These macros are also defined in (with numerically identical values) but this serves to shut up cpp's complaining. */ +#ifdef __USE_MISC #ifdef NL0 # undef NL0 #endif @@ -82,6 +83,7 @@ #ifdef NOFLSH # undef NOFLSH #endif +#endif /* Hurd ioctl request are made up of several fields: