From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sthibaul@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1792)
 id F32D7384607A; Thu, 27 Aug 2020 11:36:41 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F32D7384607A
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Samuel Thibault <sthibaul@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] hurd: define BSD 4.3 ioctls only under __USE_MISC
X-Act-Checkin: glibc
X-Git-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 5df6ebcf44fd89d429c1fee78c893e280a551ee8
X-Git-Newrev: cd41ffeb0bbca641a02e1030e13ab317ce7d645c
Message-Id: <20200827113641.F32D7384607A@sourceware.org>
Date: Thu, 27 Aug 2020 11:36:41 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2020 11:36:42 -0000

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

commit cd41ffeb0bbca641a02e1030e13ab317ce7d645c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Aug 27 13:35:58 2020 +0200

    hurd: define BSD 4.3 ioctls only under __USE_MISC

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 eed63e759b..1226186ff9 100644
--- a/sysdeps/mach/hurd/bits/ioctls.h
+++ b/sysdeps/mach/hurd/bits/ioctls.h
@@ -321,6 +321,7 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_32, IOC_64 };
 /* Compatibility with 4.3 BSD terminal driver.
    From 4.4 <sys/ioctl_compat.h>.  */
 
+#ifdef __USE_MISC
 #ifdef USE_OLD_TTY
 # undef  TIOCGETD
 # define TIOCGETD	_IOR('t', 0, int)	/* get line discipline */
@@ -428,5 +429,6 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_32, IOC_64 };
 # define EXTA	14
 # define EXTB	15
 #endif /* USE_OLD_TTY */
+#endif
 
 #endif /* bits/ioctls.h */