From: Elliott Hughes <enh@google.com>
Date: Fri, 18 Jul 2014 00:10:02 +0000 (-0700)
Subject: Remove SIOCKILLADDR from <sys/socket.h>.
X-Git-Tag: android-x86-6.0-r1~14^2~950^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=291da8d3533b3ee47f8d742c72d789d3149d15da;p=android-x86%2Fbionic.git

Remove SIOCKILLADDR from <sys/socket.h>.

(cherry picked from commit 8a3d1ca183e19d849728318fe8b0d36856fa000f)

Change-Id: Idb5cc4cff3ece7fa8740db12a19438d1a1c9a6a8
---

diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h
index 3b11d202d..ae2f2381e 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