From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sat, 1 Jun 2024 21:16:35 +0000 (+0200)
Subject: git-ioctls-bsd
X-Git-Tag: archive/raspbian/2.38-12+rpi1^2~66
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e50f083f57ba7510b32eb5c18f8541d4c064afe1;p=glibc.git

git-ioctls-bsd

commit 2fb85a37874c09fb22cd069f7c3c7fd6d8eb2f8f
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
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.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name git-ioctls-bsd.diff
---

diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h
index 943d5e428..1b2fd6b33 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: