From ef7472070942a527be96d3dceface75c8c96d365 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 12 Mar 2011 22:52:58 +0100 Subject: libintl.h: add _(x) and N_(x) and use it everywhere remove _LIBC part from rpc headers include libintl.h to rpc_private.h and use that instead of rpc.h include libintl.h anywhere else needed replacing _(x) and N_(x) Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/inet/gai_strerror.c | 3 +-- libc/inet/rpc/auth_unix.c | 1 + libc/inet/rpc/get_myaddress.c | 1 + libc/inet/rpc/pm_getmaps.c | 2 +- libc/inet/rpc/pmap_clnt.c | 2 +- libc/inet/rpc/rpc_private.h | 1 + libc/inet/rpc/ruserpass.c | 3 +-- libc/inet/rpc/svc_run.c | 2 +- libc/inet/rpc/svc_tcp.c | 2 +- libc/inet/rpc/svc_udp.c | 2 +- libc/inet/rpc/svc_unix.c | 2 +- libc/inet/rpc/xdr.c | 1 + libc/inet/rpc/xdr_array.c | 1 + libc/inet/rpc/xdr_rec.c | 2 +- libc/inet/rpc/xdr_reference.c | 1 + 15 files changed, 15 insertions(+), 11 deletions(-) (limited to 'libc/inet') diff --git a/libc/inet/gai_strerror.c b/libc/inet/gai_strerror.c index cfcb50775..ab6bf982a 100644 --- a/libc/inet/gai_strerror.c +++ b/libc/inet/gai_strerror.c @@ -19,9 +19,8 @@ #include #include +#include -#define N_(x) x -#define _(x) x static const struct { int code; diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c index 62d97dca5..95d08f00d 100644 --- a/libc/inet/rpc/auth_unix.c +++ b/libc/inet/rpc/auth_unix.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include diff --git a/libc/inet/rpc/get_myaddress.c b/libc/inet/rpc/get_myaddress.c index ab4ac3345..04999a199 100644 --- a/libc/inet/rpc/get_myaddress.c +++ b/libc/inet/rpc/get_myaddress.c @@ -44,6 +44,7 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro"; #include #include #include +#include #include #include /* Order of following two #includes reversed by roland@gnu */ diff --git a/libc/inet/rpc/pm_getmaps.c b/libc/inet/rpc/pm_getmaps.c index e7b97e631..1c313c28c 100644 --- a/libc/inet/rpc/pm_getmaps.c +++ b/libc/inet/rpc/pm_getmaps.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro"; * Copyright (C) 1984, Sun Microsystems, Inc. */ -#include +#include "rpc_private.h" #include #include #include diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c index 868326e62..20a54313b 100644 --- a/libc/inet/rpc/pmap_clnt.c +++ b/libc/inet/rpc/pmap_clnt.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include "rpc_private.h" #include #include diff --git a/libc/inet/rpc/rpc_private.h b/libc/inet/rpc/rpc_private.h index adb81383c..9e01df49a 100644 --- a/libc/inet/rpc/rpc_private.h +++ b/libc/inet/rpc/rpc_private.h @@ -1,6 +1,7 @@ #ifndef _RPC_PRIVATE_H #define _RPC_PRIVATE_H #include +#include /* Now define the internal interfaces. */ extern u_long _create_xid (void) attribute_hidden; diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c index dd8302150..d2b5eeb45 100644 --- a/libc/inet/rpc/ruserpass.c +++ b/libc/inet/rpc/ruserpass.c @@ -39,9 +39,8 @@ #include #include #include +#include - -#define _(X) (X) /* #include "ftp_var.h" */ static int token (void); diff --git a/libc/inet/rpc/svc_run.c b/libc/inet/rpc/svc_run.c index a685df36c..f3e020951 100644 --- a/libc/inet/rpc/svc_run.c +++ b/libc/inet/rpc/svc_run.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include "rpc_private.h" /* used by svc_[max_]pollfd */ diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c index 981059400..e44becf4b 100644 --- a/libc/inet/rpc/svc_tcp.c +++ b/libc/inet/rpc/svc_tcp.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro"; #include #include #include -#include +#include "rpc_private.h" #include #include #include diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c index 0d3840eec..9a185d208 100644 --- a/libc/inet/rpc/svc_udp.c +++ b/libc/inet/rpc/svc_udp.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro"; #include #include #include -#include +#include "rpc_private.h" #include #include diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c index 1a7874c62..715f6e43a 100644 --- a/libc/inet/rpc/svc_unix.c +++ b/libc/inet/rpc/svc_unix.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include "rpc_private.h" #include #include #include diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c index de10c45e9..d07607cf8 100644 --- a/libc/inet/rpc/xdr.c +++ b/libc/inet/rpc/xdr.c @@ -44,6 +44,7 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12"; #include #include #include +#include #include #include diff --git a/libc/inet/rpc/xdr_array.c b/libc/inet/rpc/xdr_array.c index cd9005069..a058f93f2 100644 --- a/libc/inet/rpc/xdr_array.c +++ b/libc/inet/rpc/xdr_array.c @@ -45,6 +45,7 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro"; #include #include #include +#include #ifdef USE_IN_LIBIO # include diff --git a/libc/inet/rpc/xdr_rec.c b/libc/inet/rpc/xdr_rec.c index a5f49c67e..f02f50e78 100644 --- a/libc/inet/rpc/xdr_rec.c +++ b/libc/inet/rpc/xdr_rec.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include "rpc_private.h" #ifdef USE_IN_LIBIO # include diff --git a/libc/inet/rpc/xdr_reference.c b/libc/inet/rpc/xdr_reference.c index 6061e93c3..a7a494ac2 100644 --- a/libc/inet/rpc/xdr_reference.c +++ b/libc/inet/rpc/xdr_reference.c @@ -44,6 +44,7 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI"; #include #include #include +#include #ifdef USE_IN_LIBIO # include -- cgit v1.2.3