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 --git a/ChangeLog b/ChangeLog
index 15ed1438f6aaafd25f92d51fb7dec295652955db..c6dbb2e817634ca2e8978db429acf21f31aacd8c 100644 (file)
--- 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 082f8b903125305246aa0a8d3ecd1efb16266a1c..ff5b705f41b1fe9052a5026f0f9ad490fd837a05 100644 (file)
--- 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>