From aaf50c7a892586e05d638e670bc2df62f838019a Mon Sep 17 00:00:00 2001
From: Peter S. Mazinger <ps.m@gmx.net>
Date: Sat, 12 Mar 2011 21:24:44 +0100
Subject: [PATCH 016/396] remove __FORCE_GLIBC

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
---
 include/rpc/auth.h                          |    8 --------
 include/rpc/rpc.h                           |    8 --------
 include/rpc/types.h                         |    8 --------
 include/rpc/xdr.h                           |    5 -----
 libc/inet/addr.c                            |    2 --
 libc/inet/ether_addr.c                      |    2 --
 libc/inet/gai_strerror.c                    |    2 --
 libc/inet/getaddrinfo.c                     |    2 --
 libc/inet/herror.c                          |    2 --
 libc/inet/hostid.c                          |    2 --
 libc/inet/if_index.c                        |    2 --
 libc/inet/ifaddrs.c                         |    2 --
 libc/inet/in6_addr.c                        |    2 --
 libc/inet/inet_net.c                        |    2 --
 libc/inet/ntop.c                            |    2 --
 libc/inet/resolv.c                          |    2 --
 libc/inet/rpc/auth_none.c                   |    2 --
 libc/inet/rpc/auth_unix.c                   |    3 ---
 libc/inet/rpc/bindresvport.c                |    3 ---
 libc/inet/rpc/clnt_generic.c                |    3 ---
 libc/inet/rpc/clnt_perror.c                 |    3 ---
 libc/inet/rpc/clnt_raw.c                    |    1 -
 libc/inet/rpc/clnt_simple.c                 |    3 ---
 libc/inet/rpc/clnt_tcp.c                    |    3 ---
 libc/inet/rpc/clnt_udp.c                    |    3 ---
 libc/inet/rpc/clnt_unix.c                   |    3 ---
 libc/inet/rpc/create_xid.c                  |    3 ---
 libc/inet/rpc/getrpcent.c                   |    2 --
 libc/inet/rpc/getrpcport.c                  |    3 ---
 libc/inet/rpc/pmap_clnt.c                   |    3 ---
 libc/inet/rpc/pmap_rmt.c                    |    3 ---
 libc/inet/rpc/rexec.c                       |    2 --
 libc/inet/rpc/rpc_cmsg.c                    |    3 ---
 libc/inet/rpc/rpc_dtablesize.c              |    4 ----
 libc/inet/rpc/rpc_prot.c                    |    3 ---
 libc/inet/rpc/rpc_thread.c                  |    2 --
 libc/inet/rpc/rtime.c                       |    3 ---
 libc/inet/rpc/ruserpass.c                   |    2 --
 libc/inet/rpc/sa_len.c                      |    2 --
 libc/inet/rpc/svc.c                         |    3 ---
 libc/inet/rpc/svc_authux.c                  |    3 ---
 libc/inet/rpc/svc_raw.c                     |    2 --
 libc/inet/rpc/svc_run.c                     |    3 ---
 libc/inet/rpc/svc_simple.c                  |    3 ---
 libc/inet/rpc/svc_tcp.c                     |    3 ---
 libc/inet/rpc/svc_udp.c                     |    3 ---
 libc/inet/rpc/svc_unix.c                    |    3 ---
 libc/inet/rpc/xdr.c                         |    3 ---
 libc/inet/rpc/xdr_array.c                   |    3 ---
 libc/inet/rpc/xdr_float.c                   |    3 ---
 libc/inet/rpc/xdr_rec.c                     |    4 ----
 libc/inet/rpc/xdr_reference.c               |    3 ---
 libc/inet/socketcalls.c                     |    2 --
 libc/misc/syslog/syslog.c                   |    2 --
 libc/sysdeps/linux/common/cmsg_nxthdr.c     |    1 -
 libcrypt/crypt.c                            |    1 -
 libcrypt/crypt_stub.c                       |    1 -
 libcrypt/des.c                              |    1 -
 libpthread/linuxthreads.old/cancel.c        |    2 --
 libpthread/linuxthreads.old/errno.c         |    2 --
 libpthread/linuxthreads.old/pthread.c       |    2 --
 libpthread/linuxthreads.old/spinlock.c      |    2 --
 libpthread/linuxthreads.old/wrapsyscall.c   |    2 --
 libpthread/linuxthreads.old_db/thread_dbP.h |    2 --
 64 files changed, 0 insertions(+), 174 deletions(-)

diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index a156c56..9a7a7d3 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -42,14 +42,6 @@
 
 #define _RPC_AUTH_H	1
 #ifdef _LIBC
-/* Some adjustments to make the libc source from glibc
- * compile more easily with uClibc... */
-#ifndef __FORCE_GLIBC
-#define __FORCE_GLIBC
-#endif
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #define _(X)	X
 #endif
 #include <features.h>
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index d97c831..cd5d8a8 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -39,14 +39,6 @@
 #define _RPC_RPC_H 1
 
 #ifdef _LIBC
-/* Some adjustments to make the libc source from glibc
- * compile more easily with uClibc... */
-#ifndef __FORCE_GLIBC
-#define __FORCE_GLIBC
-#endif
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #define _(X)	X
 #include <features.h>
 #endif
diff --git a/include/rpc/types.h b/include/rpc/types.h
index 05f49c3..e166ddf 100644
--- a/include/rpc/types.h
+++ b/include/rpc/types.h
@@ -34,14 +34,6 @@
 #define _RPC_TYPES_H 1
 
 #ifdef _LIBC
-/* Some adjustments to make the libc source from glibc
- * compile more easily with uClibc... */
-#ifndef __FORCE_GLIBC
-#define __FORCE_GLIBC
-#endif
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #define _(X)	X
 #endif
 #include <features.h>
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 9981e3a..24cc8f8 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -37,11 +37,6 @@
 #define _RPC_XDR_H 1
 
 #ifdef _LIBC
-/* Some adjustments to make the libc source from glibc
- * compile more easily with uClibc... */
-# ifndef __FORCE_GLIBC
-#  define __FORCE_GLIBC
-# endif
 # define _(X)	X
 #endif
 #include <features.h>
diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index 8ae8576..363adb6 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -17,8 +17,6 @@
  * Changed to use _int10tostr.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c
index 9071d71..dcdbb7f 100644
--- a/libc/inet/ether_addr.c
+++ b/libc/inet/ether_addr.c
@@ -23,8 +23,6 @@
  * 	- initial uClibc port
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libc/inet/gai_strerror.c b/libc/inet/gai_strerror.c
index 61688ba..cfcb507 100644
--- a/libc/inet/gai_strerror.c
+++ b/libc/inet/gai_strerror.c
@@ -17,8 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <stdio.h>
 #include <netdb.h>
 
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index e7511f6..fb00e04 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -51,8 +51,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
   If these license terms cause you a real problem, contact the author.  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <assert.h>
 #include <errno.h>
 #include <netdb.h>
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index a1f94ad..53d29ff 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -17,8 +17,6 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <stdio.h>
 #include <string.h>
 #include <netdb.h>
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index 90b22ae..d05a84f 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -5,8 +5,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <errno.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index a1c23de..e2f2da1 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -20,8 +20,6 @@
    Reworked Dec 2002 by Erik Andersen <andersen@codepoet.org>
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <string.h>
 #include <alloca.h>
 #include <errno.h>
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index 3d2d21f..d9be479 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -17,8 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <alloca.h>
 #include <assert.h>
 #include <errno.h>
diff --git a/libc/inet/in6_addr.c b/libc/inet/in6_addr.c
index 321a9f6..735f8a3 100644
--- a/libc/inet/in6_addr.c
+++ b/libc/inet/in6_addr.c
@@ -17,8 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <netinet/in.h>
 
 #ifdef __UCLIBC_HAS_IPV6__
diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c
index 3740311..a1d2b3d 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -32,8 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <ctype.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c
index fa733e0..0181a41 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -15,8 +15,6 @@
  * SOFTWARE.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index a730584..a764c1c 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -293,8 +293,6 @@ Domain name in a message can be represented as either:
    - a sequence of labels ending with a pointer
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdio_ext.h>
diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index c48bbfe..e1ab082 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -35,8 +35,6 @@
  * credentials and verifiers to remote systems.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include "rpc_private.h"
 
 
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 1337214..62d97dc 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -38,9 +38,6 @@
  * for the credentials.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/libc/inet/rpc/bindresvport.c b/libc/inet/rpc/bindresvport.c
index fc077af..30bbd26 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -30,9 +30,6 @@
  * Copyright (c) 1987 by Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/libc/inet/rpc/clnt_generic.c b/libc/inet/rpc/clnt_generic.c
index 8aeae1e..a535467 100644
--- a/libc/inet/rpc/clnt_generic.c
+++ b/libc/inet/rpc/clnt_generic.c
@@ -30,9 +30,6 @@
  * Copyright (C) 1987, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <alloca.h>
 #include <errno.h>
 #include <string.h>
diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c
index 8dbae72..18114b7 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -38,9 +38,6 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
  *
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <string.h>
 #include "rpc_private.h"
diff --git a/libc/inet/rpc/clnt_raw.c b/libc/inet/rpc/clnt_raw.c
index 75dd982..ddc1c14 100644
--- a/libc/inet/rpc/clnt_raw.c
+++ b/libc/inet/rpc/clnt_raw.c
@@ -42,7 +42,6 @@ static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
  * any interference from the kernel.
  */
 
-#define __FORCE_GLIBC
 #include <features.h>
 #include "rpc_private.h"
 #include <rpc/svc.h>
diff --git a/libc/inet/rpc/clnt_simple.c b/libc/inet/rpc/clnt_simple.c
index f66228a..d67e695 100644
--- a/libc/inet/rpc/clnt_simple.c
+++ b/libc/inet/rpc/clnt_simple.c
@@ -38,9 +38,6 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <alloca.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index d8d7bb3..308ecee 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -50,9 +50,6 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
  * Now go hang yourself.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <netdb.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index aca3e33..f0c8ce8 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -37,9 +37,6 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <rpc/rpc.h>
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 9870149..d79dbd7 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -46,9 +46,6 @@
  * Now go hang yourself.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <netdb.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c
index 3b4e8c0..de7f7cf 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -17,9 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/time.h>
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c
index de20d64..dba2a68 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -33,8 +33,6 @@
  * Copyright (c) 1985 by Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/libc/inet/rpc/getrpcport.c b/libc/inet/rpc/getrpcport.c
index 9c4f443..84f1e5f 100644
--- a/libc/inet/rpc/getrpcport.c
+++ b/libc/inet/rpc/getrpcport.c
@@ -35,9 +35,6 @@ static  char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
  * Copyright (c) 1985 by Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <alloca.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index c35a2e9..868326e 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -34,9 +34,6 @@
  * Client interface to pmap rpc service.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <net/if.h>
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index f9dd6e7..0c49940 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -39,9 +39,6 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <unistd.h>
 #include <string.h>
 #include <rpc/rpc.h>
diff --git a/libc/inet/rpc/rexec.c b/libc/inet/rpc/rexec.c
index 4148fdd..9f7cc80 100644
--- a/libc/inet/rpc/rexec.c
+++ b/libc/inet/rpc/rexec.c
@@ -27,8 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/libc/inet/rpc/rpc_cmsg.c b/libc/inet/rpc/rpc_cmsg.c
index a8c2573..06d042e 100644
--- a/libc/inet/rpc/rpc_cmsg.c
+++ b/libc/inet/rpc/rpc_cmsg.c
@@ -38,9 +38,6 @@ static char sccsid[] = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
  *
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <string.h>
 #include <sys/param.h>
 #include <rpc/rpc.h>
diff --git a/libc/inet/rpc/rpc_dtablesize.c b/libc/inet/rpc/rpc_dtablesize.c
index 692e8fc..45cab62 100644
--- a/libc/inet/rpc/rpc_dtablesize.c
+++ b/libc/inet/rpc/rpc_dtablesize.c
@@ -31,10 +31,6 @@
 static char sccsid[] = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
 #endif
 
-#define __FORCE_GLIBC
-#define __USE_BSD
-#include <features.h>
-
 #include <unistd.h>
 #include <rpc/clnt.h>
 
diff --git a/libc/inet/rpc/rpc_prot.c b/libc/inet/rpc/rpc_prot.c
index bf55a3c..d43214d 100644
--- a/libc/inet/rpc/rpc_prot.c
+++ b/libc/inet/rpc/rpc_prot.c
@@ -44,9 +44,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
  * routines are also in this program.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <sys/param.h>
 
 #include <rpc/rpc.h>
diff --git a/libc/inet/rpc/rpc_thread.c b/libc/inet/rpc/rpc_thread.c
index 71303b2..ff75279 100644
--- a/libc/inet/rpc/rpc_thread.c
+++ b/libc/inet/rpc/rpc_thread.c
@@ -4,8 +4,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <stdio.h>
 #include <assert.h>
 #include "rpc_private.h"
diff --git a/libc/inet/rpc/rtime.c b/libc/inet/rpc/rtime.c
index 8a78c29..02016bf 100644
--- a/libc/inet/rpc/rtime.c
+++ b/libc/inet/rpc/rtime.c
@@ -43,9 +43,6 @@ static char sccsid[] = "@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 S
  * what unix uses.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <rpc/rpc.h>
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index 0e4b74f..dd83021 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -27,8 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/libc/inet/rpc/sa_len.c b/libc/inet/rpc/sa_len.c
index 5f258db..3efc7d3 100644
--- a/libc/inet/rpc/sa_len.c
+++ b/libc/inet/rpc/sa_len.c
@@ -16,8 +16,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netipx/ipx.h>
diff --git a/libc/inet/rpc/svc.c b/libc/inet/rpc/svc.c
index b28485d..6d7253a 100644
--- a/libc/inet/rpc/svc.c
+++ b/libc/inet/rpc/svc.c
@@ -36,9 +36,6 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/libc/inet/rpc/svc_authux.c b/libc/inet/rpc/svc_authux.c
index 03ec4d3..ca1a645 100644
--- a/libc/inet/rpc/svc_authux.c
+++ b/libc/inet/rpc/svc_authux.c
@@ -38,9 +38,6 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <rpc/rpc.h>
diff --git a/libc/inet/rpc/svc_raw.c b/libc/inet/rpc/svc_raw.c
index f915a7d..b76663d 100644
--- a/libc/inet/rpc/svc_raw.c
+++ b/libc/inet/rpc/svc_raw.c
@@ -40,8 +40,6 @@ static char sccsid[] = "@(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include "rpc_private.h"
 #include <rpc/svc.h>
 
diff --git a/libc/inet/rpc/svc_run.c b/libc/inet/rpc/svc_run.c
index 1442cba..a685df3 100644
--- a/libc/inet/rpc/svc_run.c
+++ b/libc/inet/rpc/svc_run.c
@@ -31,9 +31,6 @@
  * Wait for input, call server program.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <errno.h>
 #include <unistd.h>
 #include <sys/poll.h>
diff --git a/libc/inet/rpc/svc_simple.c b/libc/inet/rpc/svc_simple.c
index dceb6ac..8972f73 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -38,9 +38,6 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c
index 363f203..9810594 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -41,9 +41,6 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
  * and a record/tcp stream.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c
index 87015c6..0d3840e 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -39,9 +39,6 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c
index 6185977..1a7874c 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -37,9 +37,6 @@
  * and a record/unix stream.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index bcf8901..de10c45 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -41,9 +41,6 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
  * xdr.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>
diff --git a/libc/inet/rpc/xdr_array.c b/libc/inet/rpc/xdr_array.c
index 61603ed..cd90050 100644
--- a/libc/inet/rpc/xdr_array.c
+++ b/libc/inet/rpc/xdr_array.c
@@ -40,9 +40,6 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
  * arrays.  See xdr.h for more info on the interface to xdr.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <rpc/types.h>
diff --git a/libc/inet/rpc/xdr_float.c b/libc/inet/rpc/xdr_float.c
index fd3863f..5121239 100644
--- a/libc/inet/rpc/xdr_float.c
+++ b/libc/inet/rpc/xdr_float.c
@@ -41,9 +41,6 @@ static char sccsid[] = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
  * xdr.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <endian.h>
 
diff --git a/libc/inet/rpc/xdr_rec.c b/libc/inet/rpc/xdr_rec.c
index 1e02e7f..a5f49c6 100644
--- a/libc/inet/rpc/xdr_rec.c
+++ b/libc/inet/rpc/xdr_rec.c
@@ -44,10 +44,6 @@
  * The other 31 bits encode the byte length of the fragment.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
-
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/libc/inet/rpc/xdr_reference.c b/libc/inet/rpc/xdr_reference.c
index 1c601fc..6061e93 100644
--- a/libc/inet/rpc/xdr_reference.c
+++ b/libc/inet/rpc/xdr_reference.c
@@ -40,9 +40,6 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
  * "pointers".  See xdr.h for more info on the interface to xdr.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <rpc/types.h>
diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c
index aae7e93..7ee3670 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -4,8 +4,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <errno.h>
 #include <syscall.h>
 #include <sys/socket.h>
diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c
index f1b848f..1b109e5 100644
--- a/libc/misc/syslog/syslog.c
+++ b/libc/misc/syslog/syslog.c
@@ -58,8 +58,6 @@
  *  - Major code cleanup.
  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/file.h>
diff --git a/libc/sysdeps/linux/common/cmsg_nxthdr.c b/libc/sysdeps/linux/common/cmsg_nxthdr.c
index 0360b47..bc58a18 100644
--- a/libc/sysdeps/linux/common/cmsg_nxthdr.c
+++ b/libc/sysdeps/linux/common/cmsg_nxthdr.c
@@ -17,7 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define __FORCE_GLIBC
 #include <features.h>
 /* Prevent math.h from defining a colliding inline */
 #undef __USE_EXTERN_INLINES
diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
index e5274a5..f79c9fe 100644
--- a/libcrypt/crypt.c
+++ b/libcrypt/crypt.c
@@ -5,7 +5,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#define __FORCE_GLIBC
 #include <unistd.h>
 #include <crypt.h>
 #include "libcrypt.h"
diff --git a/libcrypt/crypt_stub.c b/libcrypt/crypt_stub.c
index 76645a0..580df6c 100644
--- a/libcrypt/crypt_stub.c
+++ b/libcrypt/crypt_stub.c
@@ -5,7 +5,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#define __FORCE_GLIBC
 #include <crypt.h>
 #include <unistd.h>
 #include "libcrypt.h"
diff --git a/libcrypt/des.c b/libcrypt/des.c
index 6af65b6..64a977c 100644
--- a/libcrypt/des.c
+++ b/libcrypt/des.c
@@ -56,7 +56,6 @@
  *	alignment).
  */
 
-#define __FORCE_GLIBC
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/libpthread/linuxthreads.old/cancel.c b/libpthread/linuxthreads.old/cancel.c
index 0e5defb..392d1d5 100644
--- a/libpthread/linuxthreads.old/cancel.c
+++ b/libpthread/linuxthreads.old/cancel.c
@@ -14,8 +14,6 @@
 
 /* Thread cancellation */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <errno.h>
 #include "pthread.h"
 #include "internals.h"
diff --git a/libpthread/linuxthreads.old/errno.c b/libpthread/linuxthreads.old/errno.c
index f5778f9..748c1d5 100644
--- a/libpthread/linuxthreads.old/errno.c
+++ b/libpthread/linuxthreads.old/errno.c
@@ -14,8 +14,6 @@
 
 /* Define the location of errno for the remainder of the C library */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <errno.h>
 #include <netdb.h>
 #include "pthread.h"
diff --git a/libpthread/linuxthreads.old/pthread.c b/libpthread/linuxthreads.old/pthread.c
index 42e03f4..75eb252 100644
--- a/libpthread/linuxthreads.old/pthread.c
+++ b/libpthread/linuxthreads.old/pthread.c
@@ -14,8 +14,6 @@
 
 /* Thread creation, initialization, and basic low-level routines */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <errno.h>
 #include <netdb.h>	/* for h_errno */
 #include <stddef.h>
diff --git a/libpthread/linuxthreads.old/spinlock.c b/libpthread/linuxthreads.old/spinlock.c
index 24c81d4..31702bf 100644
--- a/libpthread/linuxthreads.old/spinlock.c
+++ b/libpthread/linuxthreads.old/spinlock.c
@@ -14,8 +14,6 @@
 
 /* Internal locks */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <errno.h>
 #include <sched.h>
 #include <time.h>
diff --git a/libpthread/linuxthreads.old/wrapsyscall.c b/libpthread/linuxthreads.old/wrapsyscall.c
index 6c74bd1..f609826 100644
--- a/libpthread/linuxthreads.old/wrapsyscall.c
+++ b/libpthread/linuxthreads.old/wrapsyscall.c
@@ -18,8 +18,6 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <pthread.h>
diff --git a/libpthread/linuxthreads.old_db/thread_dbP.h b/libpthread/linuxthreads.old_db/thread_dbP.h
index b120c42..64fd2e5 100644
--- a/libpthread/linuxthreads.old_db/thread_dbP.h
+++ b/libpthread/linuxthreads.old_db/thread_dbP.h
@@ -2,8 +2,6 @@
 #ifndef _THREAD_DBP_H
 #define _THREAD_DBP_H	1
 
-#define __FORCE_GLIBC
-#include <features.h>
 #include <string.h>
 #include <unistd.h>
 #include "proc_service.h"
-- 
1.7.0.4

