From 455c8fd16e337f747e191a8f84dc5c45aeafd37d Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Wed, 31 Jan 2024 21:45:37 +0100 Subject: [PATCH] git-ioctls-bsd 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. Gbp-Pq: Topic hurd-i386 Gbp-Pq: Name git-ioctls-bsd.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 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 (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: -- 2.30.2