aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-07-22 11:01:17 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-07-22 11:01:17 +0200
commitc1d1e0c9f242f03521ef023a0e2cac071b5f0133 (patch)
treecda3920c191a93e86d24997ba5c77f9bd3254600
parent3d03282e6687ffe595d201fa0c3a777179abb61f (diff)
downloadglibc-fw/linux-5.2.zip
glibc-fw/linux-5.2.tar.gz
glibc-fw/linux-5.2.tar.bz2
Linux: Include <linux/sockios.h> in <bits/socket.h> under __USE_MISCfw/linux-5.2
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.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h1
2 files changed, 6 insertions, 0 deletions
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>