mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
[NET]: Revert socket.h/stat.h ifdef hacks.
This reverts 57a87bb072
.
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: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2c12a74cc4
commit
304c209c9b
2 changed files with 2 additions and 2 deletions
|
@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage {
|
||||||
/* _SS_MAXSIZE value minus size of ss_family */
|
/* _SS_MAXSIZE value minus size of ss_family */
|
||||||
} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */
|
} __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 <asm/socket.h> /* arch-dependent defines */
|
||||||
#include <linux/sockios.h> /* the SIOCxxx I/O controls */
|
#include <linux/sockios.h> /* the SIOCxxx I/O controls */
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
|
||||||
|
|
||||||
#define S_IFMT 00170000
|
#define S_IFMT 00170000
|
||||||
#define S_IFSOCK 0140000
|
#define S_IFSOCK 0140000
|
||||||
|
|
Loading…
Reference in a new issue