--- include/asm-i386/socket.h.mps	2004-11-07 21:43:50.000000000 +0100
+++ include/asm-i386/socket.h	2004-11-07 21:44:36.000000000 +0100
@@ -46,7 +46,7 @@
 #define SO_ACCEPTCONN		30
 
 /* Nasty libc5 fixup - bletch */
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#if defined(__KERNEL__) || ((!defined(__GLIBC__) || (__GLIBC__ < 2)) && !defined(__UCLIBC__))
 /* Socket types. */
 #define SOCK_STREAM	1		/* stream (connection) socket	*/
 #define SOCK_DGRAM	2		/* datagram (conn.less) socket	*/
--- include/asm-i386/posix_types.h.mps	2004-11-07 21:51:37.000000000 +0100
+++ include/asm-i386/posix_types.h	2004-11-07 21:51:55.000000000 +0100
@@ -44,7 +44,7 @@
 #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
 } __kernel_fsid_t;
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#if defined(__KERNEL__) || ((!defined(__GLIBC__) || (__GLIBC__ < 2)) && !defined(__UCLIBC__))
 
 #undef	__FD_SET
 #define __FD_SET(fd,fdsetp) \