summaryrefslogtreecommitdiffstats
path: root/libc/kernel/common/linux/sync.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-09-11 19:03:02 -0700
committerElliott Hughes <enh@google.com>2012-09-12 12:30:22 -0700
commit86ec05acc9df3098c4e99e5b3ad85dcef66712c7 (patch)
tree722c7b99116ebf1af2032b2daf9e3c428386a65d /libc/kernel/common/linux/sync.h
parent666d06fee9e1d2e1401a4b42d94d01e8f38ad1a5 (diff)
downloadbionic-86ec05acc9df3098c4e99e5b3ad85dcef66712c7.zip
bionic-86ec05acc9df3098c4e99e5b3ad85dcef66712c7.tar.gz
bionic-86ec05acc9df3098c4e99e5b3ad85dcef66712c7.tar.bz2
Update the kernel headers to match external/kernel-headers.
Note that the Linux kernel handed over responsibility for most of the socket constants to glibc some time ago. Someone had updated our external/kernel-headers file but not regenerated the bionic headers, so this change copies the missing stuff from the old bionic <linux/socket.h> into <sys/socket.h>. This is what glibc does. I've hacked a few of the other files to #include <sys/socket.h> for backward compatibility, but even so this requires numerous other changes to switch people over from direct inclusion of <linux/...> headers. Change-Id: I0e4af64e631d3cef911a31d90f2f806e058278a0
Diffstat (limited to 'libc/kernel/common/linux/sync.h')
-rw-r--r--libc/kernel/common/linux/sync.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/libc/kernel/common/linux/sync.h b/libc/kernel/common/linux/sync.h
index 63c1cc8..b2c5d96 100644
--- a/libc/kernel/common/linux/sync.h
+++ b/libc/kernel/common/linux/sync.h
@@ -49,4 +49,3 @@ struct sync_fence_info_data {
#define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 1, struct sync_merge_data)
#define SYNC_IOC_FENCE_INFO _IOWR(SYNC_IOC_MAGIC, 2, struct sync_fence_info_data)
#endif
-