From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 3B59C38582A7; Sat, 2 Dec 2023 20:27:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B59C38582A7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1701548824; bh=7GU1jTjulPWzsIc6nHjTObciCZPINEj9gtsSve8DW2A=; h=From:To:Subject:Date:From; b=m0+lwcvXvMUKZpH+BfLp+bKFK68fZD/ll0socjhnf097HsBpptfId2W8ET9xonZB2 iGsf32nMdAk/Gd2M2oSbVjC8UvTm9h58+gTqrxkPTzDmpC6DQOMMkXPdqSDvJyL3D2 bFSaAdMlgry8ffuj6or0CylTvonLStt7BfhIUauc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] hurd: [!__USE_MISC] Do not #undef BSD macros in ioctls X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 4e16d89866e660426438238a47c2345bdc47dd97 X-Git-Newrev: 2fb85a37874c09fb22cd069f7c3c7fd6d8eb2f8f Message-Id: <20231202202704.3B59C38582A7@sourceware.org> Date: Sat, 2 Dec 2023 20:27:04 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2fb85a37874c09fb22cd069f7c3c7fd6d8eb2f8f commit 2fb85a37874c09fb22cd069f7c3c7fd6d8eb2f8f Author: Samuel Thibault Date: Sat Dec 2 21:24:58 2023 +0100 hurd: [!__USE_MISC] Do not #undef BSD macros in ioctls 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. Diff: --- 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: