[git commit] use one common prototype for _create_xid
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Fri Jun 15 12:00:22 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=f47d6c1b28cc323681def539bc7ebd6b3c0707c3
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
libc/inet/rpc/clnt_tcp.c | 4 +---
libc/inet/rpc/clnt_udp.c | 7 +------
libc/inet/rpc/clnt_unix.c | 5 +----
libc/inet/rpc/create_xid.c | 3 +--
libc/inet/rpc/pmap_rmt.c | 6 +-----
5 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 308ecee..1d55c02 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
#include <sys/poll.h>
#include <sys/socket.h>
#include <rpc/pmap_clnt.h>
@@ -62,8 +62,6 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
# include <wchar.h>
#endif
-extern u_long _create_xid (void) attribute_hidden;
-
#define MCALL_MSG_SIZE 24
struct ct_data
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index f0c8ce8..af5e0d2 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
#include <stdio.h>
#include <unistd.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
#include <rpc/xdr.h>
#include <rpc/clnt.h>
#include <sys/poll.h>
@@ -58,11 +58,6 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
#include <sys/uio.h>
#endif
-/* CMSG_NXTHDR is using it */
-
-
-extern u_long _create_xid (void) attribute_hidden;
-
/*
* UDP bases client side rpc operations
*/
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index d79dbd7..677758c 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -50,7 +50,7 @@
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
#include <sys/uio.h>
#include <sys/poll.h>
#include <sys/socket.h>
@@ -59,9 +59,6 @@
# include <wchar.h>
#endif
-
-extern u_long _create_xid (void) attribute_hidden;
-
#define MCALL_MSG_SIZE 24
struct ct_data
diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c
index de7f7cf..fd67359 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -20,7 +20,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <sys/time.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
/* The RPC code is not threadsafe, but new code should be threadsafe. */
@@ -31,7 +31,6 @@ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
static smallint is_initialized;
static struct drand48_data __rpc_lrand48_data;
-u_long _create_xid (void) attribute_hidden;
u_long _create_xid (void)
{
long res;
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index 0c49940..d1000ad 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
#include <unistd.h>
#include <string.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
#include <rpc/pmap_prot.h>
#include <rpc/pmap_clnt.h>
#include <rpc/pmap_rmt.h>
@@ -56,10 +56,6 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
#include <arpa/inet.h>
#define MAX_BROADCAST_SIZE 1400
-
-
-extern u_long _create_xid (void) attribute_hidden;
-
static const struct timeval timeout = {3, 0};
/*
More information about the uClibc-cvs
mailing list