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

Commit 304c209c authored by David S. Miller's avatar David S. Miller
Browse files

[NET]: Revert socket.h/stat.h ifdef hacks. 



This reverts 57a87bb0.

As H. Peter Anvin states, this change broke klibc and it's
not very easy to fix things up without duplicating everything
into userspace.

In the longer term we should have a better solution to this
problem, but for now let's unbreak things.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c12a74c

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 */



#ifdef __KERNEL__

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



#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



#ifdef __KERNEL__

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



#define S_IFMT  00170000

#define S_IFSOCK 0140000