summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-07-06 06:20:33 +0100
committerMike Frysinger <vapier@gentoo.org>2009-07-06 06:20:33 +0100
commit44577803798b43868deeb61fe3929fa7205c80d3 (patch)
treea21f7c3fef870768ae44d1ab7927b557a3fcfde5 /2.6.30/0004-linux-stat-socket-.h-remove-__GLIBC__-checks.patch
parentinitial 2.6.29 patchset based on last 2.6.28 patchset (diff)
downloadlinux-headers-patches-44577803798b43868deeb61fe3929fa7205c80d3.tar.gz
linux-headers-patches-44577803798b43868deeb61fe3929fa7205c80d3.tar.bz2
linux-headers-patches-44577803798b43868deeb61fe3929fa7205c80d3.zip
initial 2.6.30 patchset based on last 2.6.29 patchset
Diffstat (limited to '2.6.30/0004-linux-stat-socket-.h-remove-__GLIBC__-checks.patch')
-rw-r--r--2.6.30/0004-linux-stat-socket-.h-remove-__GLIBC__-checks.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/2.6.30/0004-linux-stat-socket-.h-remove-__GLIBC__-checks.patch b/2.6.30/0004-linux-stat-socket-.h-remove-__GLIBC__-checks.patch
new file mode 100644
index 0000000..d659bbc
--- /dev/null
+++ b/2.6.30/0004-linux-stat-socket-.h-remove-__GLIBC__-checks.patch
@@ -0,0 +1,42 @@
+From 72ce93502a43f213898a73a7810897b54373dafc Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 29 Dec 2008 06:52:59 -0500
+Subject: [PATCH 4/9] linux/{stat,socket}.h: remove __GLIBC__ checks
+
+Only check __KERNEL__ so we don't assume the C library is glibc.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ 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 421afb4..f8f2fa9 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 611c398..5460344 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
+--
+1.6.3.3
+