public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Samuel Thibault <sthibaul@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] hurd: [!__USE_MISC] Do not #undef BSD macros in ioctls
Date: Sat,  2 Dec 2023 20:27:04 +0000 (GMT)	[thread overview]
Message-ID: <20231202202704.3B59C38582A7@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2fb85a37874c09fb22cd069f7c3c7fd6d8eb2f8f

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.

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 <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:

                 reply	other threads:[~2023-12-02 20:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231202202704.3B59C38582A7@sourceware.org \
    --to=sthibaul@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).