am d18b87f3: Merge "Remove SIOCKILLADDR from <sys/socket.h>."
				
					
				
			* commit 'd18b87f38de8644acdcd1a112bd06d3a70d2ea1d': Remove SIOCKILLADDR from <sys/socket.h>.
This commit is contained in:
		@@ -40,13 +40,6 @@
 | 
				
			|||||||
#include <linux/types.h>
 | 
					#include <linux/types.h>
 | 
				
			||||||
#include <linux/compiler.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
 | 
					__BEGIN_DECLS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define sockaddr_storage __kernel_sockaddr_storage
 | 
					#define sockaddr_storage __kernel_sockaddr_storage
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user