am 83ce99d8: Merge "Define SIOCKILLADDR which isn\'t in the common kernel uapi headers."

* commit '83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c':
  Define SIOCKILLADDR which isn't in the common kernel uapi headers.
This commit is contained in:
Elliott Hughes 2014-07-12 12:59:27 +00:00 committed by Android Git Automerger
commit e2b177a5d1

View File

@ -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