From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Thu, 9 Jul 2009 23:45:12 +0000 (+0100)
Subject: Revert "Check for __UCLIBC__ when we include the socket definition."
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=48ca252ef7a2f9c52ebf1e9380d04aae9762c4b6;p=xenclient%2Flinux-2.6.27-pq.git

Revert "Check for __UCLIBC__ when we include the socket definition."

This reverts commit 6e541cbef0d76c341599f9462352629921e6dc66.
---

diff --git a/master/series b/master/series
index f68ad3f..32f96fd 100644
--- 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
deleted file mode 100644
index a68ecc5..0000000
--- a/master/socket-header-uclibc
+++ /dev/null
@@ -1,13 +0,0 @@
-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	*/