OSDN Git Service
(root)
/
android-x86
/
bionic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5bef26
)
Remove SIOCKILLADDR from <sys/socket.h>.
author
Elliott Hughes
<enh@google.com>
Fri, 18 Jul 2014 00:10:02 +0000
(17:10 -0700)
committer
Elliott Hughes
<enh@google.com>
Fri, 18 Jul 2014 23:53:23 +0000
(16:53 -0700)
(cherry picked from commit
8a3d1ca183e19d849728318fe8b0d36856fa000f
)
Change-Id: Idb5cc4cff3ece7fa8740db12a19438d1a1c9a6a8
libc/include/sys/socket.h
patch
|
blob
|
history
diff --git
a/libc/include/sys/socket.h
b/libc/include/sys/socket.h
index
3b11d20
..
ae2f238
100644
(file)
--- 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