Move the #includes of reentrant.h to after the `#include "namespace.h"',

so that the underscored versions of the pthread functions get
declared.  This removes around 300 lines of 'implicit declaration
of XXX' warnings from the output of a libc build with -Wall.

Reviewed by:	Martin Blapp <mb@imp.ch>, alfred

23 files changed, 23 insertions, 23 deletions

diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index e154cd2..e7aef64 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -33,8 +33,8 @@
 /*
  * auth_des.c, client-side implementation of DES authentication
  */
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <err.h>
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 403e00d..666c8d7 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -44,8 +44,8 @@ static char *sccsid = "@(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <rpc/types.h>
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 37d0ce9..0bf99b2 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -48,8 +48,8 @@ static char *sccsid = "@(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";
  *
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/param.h>
 
 #include <assert.h>
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
index 0ee84d8..2b07755 100644
--- a/lib/libc/rpc/clnt_dg.c
+++ b/lib/libc/rpc/clnt_dg.c
@@ -45,8 +45,8 @@ static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
  * Implements a connectionless client side RPC.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/poll.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 696ea54..f1f9364 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -40,8 +40,8 @@ static char *rcsid = "$FreeBSD$";
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
  */
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index 01dfc79..a847a80 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -47,8 +47,8 @@ static char *rcsid = "$FreeBSD$";
  * any interference from the kernal.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <assert.h>
 #include <err.h>
 #include <stdio.h>
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index 09b65fc..f8c29d0 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -44,8 +44,8 @@ static char *rcsid = "$FreeBSD$";
  *
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/param.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index 737e3c7..2a2fce8 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -56,8 +56,8 @@ static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
  * Now go hang yourself.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/poll.h>
 #include <sys/syslog.h>
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index 36ea793..3fbb39a 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -40,8 +40,8 @@ static        char sccsid[] = "@(#)getnetconfig.c	1.12 91/12/19 SMI";
  * Copyright (c) 1989 by Sun Microsystems, Inc.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/cdefs.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index 86cd597..ef0f241 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -46,8 +46,8 @@ static char rcsid[] =
  * gendeskey(deskey) - generate a secure des key
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc/rpc/mt_misc.c b/lib/libc/rpc/mt_misc.c
index 5abf831..4c6f5bb 100644
--- a/lib/libc/rpc/mt_misc.c
+++ b/lib/libc/rpc/mt_misc.c
@@ -3,8 +3,8 @@
 
 /* #pragma ident	"@(#)mt_misc.c	1.24	93/04/29 SMI" */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <rpc/rpc.h>
 #include <sys/time.h>
 #include <stdlib.h>
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index 790bbc5..3275568 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -40,8 +40,8 @@
  *
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index 4d80f00..b342cce 100644
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -55,8 +55,8 @@ static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
  * of TLI/Streams
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index 2fdc74f..6ad34f3 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -49,8 +49,8 @@ static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
  * Copyright (C) 1988, Sun Microsystems, Inc.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 6e57245..fe4d37d 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -45,8 +45,8 @@ static char *rcsid = "$FreeBSD$";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/poll.h>
 #include <assert.h>
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index 48d65b0..d36ea79 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -46,8 +46,8 @@ static const char rcsid[] = "$FreeBSD$";
  *
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <rpc/rpc.h>
 #include <stdlib.h>
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index 0d363c1..469bf65 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -46,8 +46,8 @@
  *
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index 03ace97..cf828a4 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -43,8 +43,8 @@
  * Does some caching in the hopes of achieving execute-at-most-once semantics.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
index 773118d..13ab43d 100644
--- a/lib/libc/rpc/svc_generic.c
+++ b/lib/libc/rpc/svc_generic.c
@@ -47,8 +47,8 @@ static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
  *
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index 5ab10f8..63017c2 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -49,8 +49,8 @@ static char *rcsid = "$FreeBSD$";
  *
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <rpc/rpc.h>
 #include <sys/types.h>
 #include <rpc/raw.h>
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index 78862fe..08f3776 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -40,8 +40,8 @@ static char *rcsid = "$FreeBSD$";
  * This is the rpc server side idle loop
  * Wait for input, call server program.
  */
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <err.h>
 #include <errno.h>
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index fec87b7..83118bc 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -47,8 +47,8 @@
  * for the given prognum and procnum.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <rpc/rpc.h>
 #include <rpc/nettype.h>
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index e867bf1..052678b 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -44,8 +44,8 @@ static char *sccsid = "@(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";
  * and a record/tcp stream.
  */
 
-#include "reentrant.h"
 #include "namespace.h"
+#include "reentrant.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/poll.h>