Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=57a87bb0720a5cf7a9ece49a8c8ed288398fd1bb
Commit:     57a87bb0720a5cf7a9ece49a8c8ed288398fd1bb
Parent:     4564f9e5fd00767d11fcf61e0d52787706dfcc87
Author:     Mike Frysinger <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 10 01:45:01 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Feb 11 10:51:26 2007 -0800

    [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" <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[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 fcd35a2..28157a3 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 */
 
-#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     */
diff --git a/include/linux/stat.h b/include/linux/stat.h
index 679ef0d..4f8539c 100644
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -7,7 +7,7 @@
 
 #endif
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#ifdef __KERNEL__
 
 #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