[glibc/fw/linux-5.2] Linux: Include <linux/sockios.h> in <bits/socket.h> under __USE_MISC

[Florian Weimer <fw@sourceware.org>]

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

commit c1d1e0c9f242f03521ef023a0e2cac071b5f0133
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon Jul 22 11:01:17 2019 +0200

    Linux: Include <linux/sockios.h> in <bits/socket.h> under __USE_MISC
    
    Historically, <asm/socket.h> (which is included from <bits/socket.h>)
    provided ioctl operations for sockets.  User code accessed them
    through <sys/socket.h>.  The kernel UAPI headers have removed these
    definitions in favor of <linux/sockios.h>.  This commit makes them
    available via <sys/socket.h> again.

Diff:
---
 ChangeLog                             | 5 +++++
 sysdeps/unix/sysv/linux/bits/socket.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 15ed143..c6dbb2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-22  Florian Weimer  <fweimer@redhat.com>
+
+	* sysdeps/unix/sysv/linux/bits/socket.h [__USE_MISC]: Include
+	<linux/sockios.h>.
+
 2019-07-18  Florian Weimer  <fweimer@redhat.com>
 
 	* scripts/build-many-glibcs.py (Context.checkout): Default to
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 082f8b9..ff5b705 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -352,6 +352,7 @@ struct ucred
 #ifdef __USE_MISC
 # include <bits/types/time_t.h>
 # include <asm/socket.h>
+# include <linux/sockios.h>
 #else
 # define SO_DEBUG 1
 # include <bits/socket-constants.h>