diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-12 22:52:58 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:22 +0200 |
| commit | ef7472070942a527be96d3dceface75c8c96d365 (patch) | |
| tree | 14d614df17fdc5cb540594dfa63f94e31afb7f24 /include | |
| parent | 0dd1ccafa75e63f7688e6d55a0158d39ae3aa060 (diff) | |
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 <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libintl.h | 9 | ||||
| -rw-r--r-- | include/rpc/auth.h | 3 | ||||
| -rw-r--r-- | include/rpc/rpc.h | 5 | ||||
| -rw-r--r-- | include/rpc/types.h | 5 | ||||
| -rw-r--r-- | include/rpc/xdr.h | 3 |
5 files changed, 9 insertions, 16 deletions
diff --git a/include/libintl.h b/include/libintl.h index be3969fff..6631d0b26 100644 --- a/include/libintl.h +++ b/include/libintl.h @@ -23,6 +23,8 @@ #include <features.h> +#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ + /* We define an additional symbol to signal that we use the GNU implementation of gettext. */ #define __USE_GNU_GETTEXT 1 @@ -125,4 +127,11 @@ extern char *bind_textdomain_codeset (__const char *__domainname, __END_DECLS +#endif /* __UCLIBC_HAS_GETTEXT_AWARENESS__ */ + +#ifdef _LIBC +# define _(x) x +# define N_(x) x +#endif + #endif /* libintl.h */ diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 9a7a7d389..1d5198ca4 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -41,9 +41,6 @@ #ifndef _RPC_AUTH_H #define _RPC_AUTH_H 1 -#ifdef _LIBC -#define _(X) X -#endif #include <features.h> #include <rpc/xdr.h> diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index cd5d8a8d7..df0542890 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -38,11 +38,6 @@ #ifndef _RPC_RPC_H #define _RPC_RPC_H 1 -#ifdef _LIBC -#define _(X) X -#include <features.h> -#endif - #include <rpc/types.h> /* some typedefs */ #include <netinet/in.h> diff --git a/include/rpc/types.h b/include/rpc/types.h index e166ddfd4..8eff8e718 100644 --- a/include/rpc/types.h +++ b/include/rpc/types.h @@ -33,11 +33,6 @@ #ifndef _RPC_TYPES_H #define _RPC_TYPES_H 1 -#ifdef _LIBC -#define _(X) X -#endif -#include <features.h> - typedef int bool_t; typedef int enum_t; /* This needs to be changed to uint32_t in the future */ diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 24cc8f821..2fbe3e7b9 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -36,9 +36,6 @@ #ifndef _RPC_XDR_H #define _RPC_XDR_H 1 -#ifdef _LIBC -# define _(X) X -#endif #include <features.h> #include <sys/types.h> #include <rpc/types.h> |