Check for __UCLIBC__ when we include the socket definition.

diff --git a/master/series b/master/series
index 32f96fd3337c43c20fcce6584ac86dcc144bd116..f68ad3f884e7c6ab853dbf339bf03de0e107aa0e 100644 (file)
--- a/master/series
+++ b/master/series
@@ -265,4 +265,4 @@ intel-hda-2.6.30
 flr-change-sbr-d3r-lists
 on-the-fly-cx-change
 bridge-carrier
-
+socket-header-uclibc

diff --git a/master/socket-header-uclibc b/master/socket-header-uclibc
new file mode 100644 (file)
index 0000000..a68ecc5
--- /dev/null
+++ b/master/socket-header-uclibc
@@ -0,0 +1,13 @@
+diff --git a/include/linux/socket.h b/include/linux/socket.h
+index dc5086f..5490bb9 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)
++#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) || defined(__UCLIBC__)
+ 
+ #include <asm/socket.h>                       /* arch-dependent defines       */
+ #include <linux/sockios.h>            /* the SIOCxxx I/O controls     */