From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 2 Dec 2023 20:24:58 +0000 (+0100)
Subject: hurd: [!__USE_MISC] Do not #undef BSD macros in ioctls
X-Git-Tag: glibc-2.39~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb85a37874c09fb22cd069f7c3c7fd6d8eb2f8f;p=thirdparty%2Fglibc.git

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 --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h
index 943d5e4287d..1b2fd6b33fb 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 <bits/termios.h> (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: