diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-18 00:17:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-17 22:33:42 +0000 |
| commit | d18b87f38de8644acdcd1a112bd06d3a70d2ea1d (patch) | |
| tree | 83b787d14832a328906913b27e881833016d7734 | |
| parent | 76282482dbb05bf97a834d20b3ccf98de3f5a31d (diff) | |
| parent | 8a3d1ca183e19d849728318fe8b0d36856fa000f (diff) | |
| download | bionic-d18b87f38de8644acdcd1a112bd06d3a70d2ea1d.zip bionic-d18b87f38de8644acdcd1a112bd06d3a70d2ea1d.tar.gz bionic-d18b87f38de8644acdcd1a112bd06d3a70d2ea1d.tar.bz2 | |
Merge "Remove SIOCKILLADDR from <sys/socket.h>."
| -rw-r--r-- | libc/include/sys/socket.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h index 3b11d20..ae2f238 100644 --- a/libc/include/sys/socket.h +++ b/libc/include/sys/socket.h @@ -40,13 +40,6 @@ #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 |