Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=304c209c9b02b0386024d037fa49b273caa0575b
Commit:     304c209c9b02b0386024d037fa49b273caa0575b
Parent:     2c12a74cc4aeaebc378aa40ee11c7761a8ed05e0
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 26 15:45:15 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Feb 28 09:41:59 2007 -0800

    [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 <[EMAIL PROTECTED]>
---
 include/linux/socket.h |    2 +-
 include/linux/stat.h   |    2 +-
 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to