diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-12 04:12:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-11 16:35:27 +0000 |
| commit | 83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c (patch) | |
| tree | d34ec98c0c25c770e8f81cafa8732ec661851e08 | |
| parent | 57a5b3380a8834ecb4a32d01433a3127454443d7 (diff) | |
| parent | 2ba2888cac2f04daff7bbaf032d0df7a095b00c3 (diff) | |
| download | bionic-83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c.zip bionic-83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c.tar.gz bionic-83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c.tar.bz2 | |
Merge "Define SIOCKILLADDR which isn't in the common kernel uapi headers."
| -rw-r--r-- | libc/include/sys/socket.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h index ae2f238..3b11d20 100644 --- a/libc/include/sys/socket.h +++ b/libc/include/sys/socket.h @@ -40,6 +40,13 @@ #include <linux/types.h> #include <linux/compiler.h> +/* This is an Android extension that won't be in the uapi headers for the common kernel. */ +#if !defined(SIOCKILLADDR) +#define SIOCKILLADDR 0x8939 +#else +#error SIOCKILLADDR defined twice +#endif + __BEGIN_DECLS #define sockaddr_storage __kernel_sockaddr_storage |