summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-02-26 15:45:15 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-28 09:41:59 -0800
commit304c209c9b02b0386024d037fa49b273caa0575b (patch)
treea3d3d5903abe7cee4c465e1377c26cf4a1ca02d1
parent2c12a74cc4aeaebc378aa40ee11c7761a8ed05e0 (diff)
downloadop-kernel-dev-304c209c9b02b0386024d037fa49b273caa0575b.zip
op-kernel-dev-304c209c9b02b0386024d037fa49b273caa0575b.tar.gz
[NET]: Revert socket.h/stat.h ifdef hacks.
This reverts 57a87bb0720a5cf7a9ece49a8c8ed288398fd1bb. 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>
-rw-r--r--include/linux/socket.h2
-rw-r--r--include/linux/stat.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 28157a3..fcd35a2 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -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 */
diff --git a/include/linux/stat.h b/include/linux/stat.h
index 4f8539c..679ef0d 100644
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -7,7 +7,7 @@
#endif
-#ifdef __KERNEL__
+#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
#define S_IFMT 00170000
#define S_IFSOCK 0140000
OpenPOWER on IntegriCloud