Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57a87bb0 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

[PATCH] scrub non-__GLIBC__ checks in linux/socket.h and linux/stat.h 



Userspace should be worrying about userspace, so having the socket.h
and stat.h pollute the namespace in the non-glibc case is wrong and
pretty much prevents any other libc from utilizing these headers
sanely unless they set up the __GLIBC__ define themselves (which
sucks)

Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4564f9e5

include/linux/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage { 
				/* _SS_MAXSIZE value minus size of ss_family */

} __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)

#ifdef __KERNEL__



#include <asm/socket.h>			/* arch-dependent defines	*/

#include <linux/sockios.h>		/* the SIOCxxx I/O controls	*/

include/linux/stat.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#endif



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)

#ifdef __KERNEL__



#define S_IFMT  00170000

#define S_IFSOCK 0140000