diff options
39 files changed, 40 insertions, 321 deletions
diff --git a/align/domains.c b/align/domains.c index 9dd49ccc..6b3f28fb 100644 --- a/align/domains.c +++ b/align/domains.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libintl.h> #include <assert.h> #ifdef HAVE_LIBVIRT diff --git a/df/domains.c b/df/domains.c index 3993bbfa..43dc47d3 100644 --- a/df/domains.c +++ b/df/domains.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libintl.h> #include <assert.h> #ifdef HAVE_LIBVIRT diff --git a/df/output.c b/df/output.c index d604566d..ba513ded 100644 --- a/df/output.c +++ b/df/output.c @@ -24,6 +24,7 @@ #include <string.h> #include <inttypes.h> #include <xvasprintf.h> +#include <libintl.h> #include <math.h> #include <assert.h> diff --git a/fish/alloc.c b/fish/alloc.c index b530254e..f6e5b8ff 100644 --- a/fish/alloc.c +++ b/fish/alloc.c @@ -25,6 +25,7 @@ #include <fcntl.h> #include <inttypes.h> #include <errno.h> +#include <libintl.h> #include "xstrtol.h" diff --git a/fish/config.c b/fish/config.c index 6c75969a..3e004cc6 100644 --- a/fish/config.c +++ b/fish/config.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libintl.h> #ifdef HAVE_LIBCONFIG #include <libconfig.h> diff --git a/fish/copy.c b/fish/copy.c index 4ff1693f..0ea605f9 100644 --- a/fish/copy.c +++ b/fish/copy.c @@ -23,6 +23,7 @@ #include <string.h> #include <unistd.h> #include <limits.h> +#include <libintl.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/wait.h> diff --git a/fish/display.c b/fish/display.c index 05933f40..a5889db8 100644 --- a/fish/display.c +++ b/fish/display.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <fcntl.h> #include <inttypes.h> +#include <libintl.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/fish/edit.c b/fish/edit.c index 517c098a..a4111806 100644 --- a/fish/edit.c +++ b/fish/edit.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <fcntl.h> #include <inttypes.h> +#include <libintl.h> #include <sys/types.h> #include <sys/stat.h> #include <assert.h> diff --git a/fish/events.c b/fish/events.c index 11063723..b98bd589 100644 --- a/fish/events.c +++ b/fish/events.c @@ -23,6 +23,7 @@ #include <string.h> #include <unistd.h> #include <inttypes.h> +#include <libintl.h> #include <assert.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/fish/fish.c b/fish/fish.c index a83f7021..d0688f1b 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -30,6 +30,7 @@ #include <sys/wait.h> #include <locale.h> #include <langinfo.h> +#include <libintl.h> #ifdef HAVE_LIBREADLINE #include <readline/readline.h> diff --git a/fish/fish.h b/fish/fish.h index e77f349a..69a76407 100644 --- a/fish/fish.h +++ b/fish/fish.h @@ -31,21 +31,8 @@ #define SOCK_CLOEXEC 0 #endif -#ifdef HAVE_GETTEXT -#include "gettext.h" #define _(str) dgettext(PACKAGE, (str)) #define N_(str) dgettext(PACKAGE, (str)) -#else -#define _(str) str -#define N_(str) str -#endif - -#if !ENABLE_NLS -#undef textdomain -#define textdomain(Domainname) /* empty */ -#undef bindtextdomain -#define bindtextdomain(Domainname, Dirname) /* empty */ -#endif #define STREQ(a,b) (strcmp((a),(b)) == 0) #define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0) diff --git a/fish/glob.c b/fish/glob.c index 108eda3b..b3cfa57d 100644 --- a/fish/glob.c +++ b/fish/glob.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" diff --git a/fish/help.c b/fish/help.c index b62739ab..c1412876 100644 --- a/fish/help.c +++ b/fish/help.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" diff --git a/fish/hexedit.c b/fish/hexedit.c index 472aa8f0..1057a315 100644 --- a/fish/hexedit.c +++ b/fish/hexedit.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <fcntl.h> #include <inttypes.h> +#include <libintl.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/fish/inspect.c b/fish/inspect.c index 3358cd48..64c66070 100644 --- a/fish/inspect.c +++ b/fish/inspect.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libintl.h> #include "c-ctype.h" diff --git a/fish/keys.c b/fish/keys.c index b66db521..80c05012 100644 --- a/fish/keys.c +++ b/fish/keys.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <termios.h> #include <string.h> +#include <libintl.h> #include "guestfs.h" @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" @@ -22,6 +22,7 @@ #include <stdlib.h> #include <signal.h> #include <string.h> +#include <libintl.h> #include <sys/wait.h> #include "fish.h" diff --git a/fish/more.c b/fish/more.c index 2ac2c3b6..c5a94d39 100644 --- a/fish/more.c +++ b/fish/more.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <fcntl.h> #include <inttypes.h> +#include <libintl.h> #include "fish.h" diff --git a/fish/options.c b/fish/options.c index 1a2e8c53..b3ad6751 100644 --- a/fish/options.c +++ b/fish/options.c @@ -20,6 +20,8 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <libintl.h> #include "c-ctype.h" diff --git a/fish/options.h b/fish/options.h index f0f5a07a..29117f64 100644 --- a/fish/options.h +++ b/fish/options.h @@ -19,22 +19,12 @@ #ifndef OPTIONS_H #define OPTIONS_H -#ifdef HAVE_GETTEXT -#include "gettext.h" #ifndef _ #define _(str) dgettext(PACKAGE, (str)) #endif #ifndef N_ #define N_(str) dgettext(PACKAGE, (str)) #endif -#else -#ifndef _ -#define _(str) str -#endif -#ifndef _ -#define N_(str) str -#endif -#endif #ifndef STREQ #define STREQ(a,b) (strcmp((a),(b)) == 0) diff --git a/fish/prep.c b/fish/prep.c index 9863bc96..665a3e9c 100644 --- a/fish/prep.c +++ b/fish/prep.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" #include "prepopts.h" diff --git a/fish/prep_boot.c b/fish/prep_boot.c index 79798cdb..75ddcca4 100644 --- a/fish/prep_boot.c +++ b/fish/prep_boot.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" #include "prepopts.h" diff --git a/fish/prep_disk.c b/fish/prep_disk.c index 055b36f4..1caee5f0 100644 --- a/fish/prep_disk.c +++ b/fish/prep_disk.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" #include "prepopts.h" diff --git a/fish/prep_fs.c b/fish/prep_fs.c index 8934de45..a0373d9c 100644 --- a/fish/prep_fs.c +++ b/fish/prep_fs.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" #include "prepopts.h" diff --git a/fish/prep_lv.c b/fish/prep_lv.c index ec380d46..f635ff9f 100644 --- a/fish/prep_lv.c +++ b/fish/prep_lv.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" #include "prepopts.h" diff --git a/fish/prep_part.c b/fish/prep_part.c index 27f4b789..fc390143 100644 --- a/fish/prep_part.c +++ b/fish/prep_part.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" #include "prepopts.h" @@ -23,6 +23,7 @@ #include <string.h> #include <unistd.h> #include <fcntl.h> +#include <libintl.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/un.h> diff --git a/fish/reopen.c b/fish/reopen.c index 585bbd23..3fc9510b 100644 --- a/fish/reopen.c +++ b/fish/reopen.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" diff --git a/fish/setenv.c b/fish/setenv.c index c2af863d..d04b1d3b 100644 --- a/fish/setenv.c +++ b/fish/setenv.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libintl.h> #include "fish.h" diff --git a/fish/supported.c b/fish/supported.c index 7b9e085e..1b558bf9 100644 --- a/fish/supported.c +++ b/fish/supported.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "fish.h" diff --git a/fish/time.c b/fish/time.c index 246a5805..17d31a71 100644 --- a/fish/time.c +++ b/fish/time.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include <sys/time.h> #include "fish.h" diff --git a/fuse/guestmount.c b/fuse/guestmount.c index 379346f9..2fe56ca4 100644 --- a/fuse/guestmount.c +++ b/fuse/guestmount.c @@ -29,6 +29,7 @@ #include <getopt.h> #include <signal.h> #include <locale.h> +#include <libintl.h> /* We're still using some of FUSE to handle command line options. */ #include <fuse.h> diff --git a/fuse/guestmount.h b/fuse/guestmount.h index a6249ec9..3f54c303 100644 --- a/fuse/guestmount.h +++ b/fuse/guestmount.h @@ -25,14 +25,8 @@ #ifndef GUESTMOUNT_H_ #define GUESTMOUNT_H_ -#ifdef HAVE_GETTEXT -#include "gettext.h" #define _(str) dgettext(PACKAGE, (str)) -//#define N_(str) dgettext(PACKAGE, (str)) -#else -#define _(str) str -//#define N_(str) str -#endif +#define N_(str) dgettext(PACKAGE, (str)) #define STREQ(a,b) (strcmp((a),(b)) == 0) #define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0) diff --git a/generator/generator_fish.ml b/generator/generator_fish.ml index c4ab69d9..97625cc4 100644 --- a/generator/generator_fish.ml +++ b/generator/generator_fish.ml @@ -62,6 +62,7 @@ let generate_fish_cmds () = pr "#include <stdlib.h>\n"; pr "#include <string.h>\n"; pr "#include <inttypes.h>\n"; + pr "#include <libintl.h>\n"; pr "\n"; pr "#include \"c-ctype.h\"\n"; pr "#include \"full-write.h\"\n"; @@ -1000,9 +1001,12 @@ and generate_fish_event_names () = generate_header CStyle GPLv2plus; pr "\ +#include <config.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libintl.h> #include \"fish.h\" diff --git a/src/Makefile.am b/src/Makefile.am index d29a38ee..30e5070e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -122,7 +122,6 @@ libguestfs_la_SOURCES = \ guestfs.h \ guestfs-internal.h \ guestfs_protocol.h \ - gettext.h \ actions.c \ appliance.c \ bindtests.c \ diff --git a/src/gettext.h b/src/gettext.h deleted file mode 100644 index 93f32e5b..00000000 --- a/src/gettext.h +++ /dev/null @@ -1,271 +0,0 @@ -/* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - -#ifndef _LIBGETTEXT_H -#define _LIBGETTEXT_H 1 - -/* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS - -/* Get declarations of GNU message catalog functions. */ -# include <libintl.h> - -/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by - the gettext() and ngettext() macros. This is an alternative to calling - textdomain(), and is useful for libraries. */ -# ifdef DEFAULT_TEXT_DOMAIN -# undef gettext -# define gettext(Msgid) \ - dgettext (DEFAULT_TEXT_DOMAIN, Msgid) -# undef ngettext -# define ngettext(Msgid1, Msgid2, N) \ - dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N) -# endif - -#else - -/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which - chokes if dcgettext is defined as a macro. So include it now, to make - later inclusions of <locale.h> a NOP. We don't include <libintl.h> - as well because people using "gettext.h" will not include <libintl.h>, - and also including <libintl.h> would fail on SunOS 4, whereas <locale.h> - is OK. */ -#if defined(__sun) -# include <locale.h> -#endif - -/* Many header files from the libstdc++ coming with g++ 3.3 or newer include - <libintl.h>, which chokes if dcgettext is defined as a macro. So include - it now, to make later inclusions of <libintl.h> a NOP. */ -#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) -# include <cstdlib> -# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H -# include <libintl.h> -# endif -#endif - -/* Disabled NLS. - The casts to 'const char *' serve the purpose of producing warnings - for invalid uses of the value returned from these functions. - On pre-ANSI systems without 'const', the config.h file is supposed to - contain "#define const". */ -# define gettext(Msgid) ((const char *) (Msgid)) -# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid)) -# define dcgettext(Domainname, Msgid, Category) \ - ((void) (Category), dgettext (Domainname, Msgid)) -# define ngettext(Msgid1, Msgid2, N) \ - ((N) == 1 \ - ? ((void) (Msgid2), (const char *) (Msgid1)) \ - : ((void) (Msgid1), (const char *) (Msgid2))) -# define dngettext(Domainname, Msgid1, Msgid2, N) \ - ((void) (Domainname), ngettext (Msgid1, Msgid2, N)) -# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ - ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N)) -# define textdomain(Domainname) ((const char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) \ - ((void) (Domainname), (const char *) (Dirname)) -# define bind_textdomain_codeset(Domainname, Codeset) \ - ((void) (Domainname), (const char *) (Codeset)) - -#endif - -/* A pseudo function call that serves as a marker for the automated - extraction of messages, but does not call gettext(). The run-time - translation is done at a different place in the code. - The argument, String, should be a literal string. Concatenated strings - and other string expressions won't work. - The macro's expansion is not parenthesized, so that it is suitable as - initializer for static 'char[]' or 'const char[]' variables. */ -#define gettext_noop(String) String - -/* The separator between msgctxt and msgid in a .mo file. */ -#define GETTEXT_CONTEXT_GLUE "\004" - -/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a - MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be - short and rarely need to change. - The letter 'p' stands for 'particular' or 'special'. */ -#ifdef DEFAULT_TEXT_DOMAIN -# define pgettext(Msgctxt, Msgid) \ - pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) -#else -# define pgettext(Msgctxt, Msgid) \ - pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) -#endif -#define dpgettext(Domainname, Msgctxt, Msgid) \ - pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) -#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \ - pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category) -#ifdef DEFAULT_TEXT_DOMAIN -# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ - npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) -#else -# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ - npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) -#endif -#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ - npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) -#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \ - npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category) - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static const char * -pgettext_aux (const char *domain, - const char *msg_ctxt_id, const char *msgid, - int category) -{ - const char *translation = dcgettext (domain, msg_ctxt_id, category); - if (translation == msg_ctxt_id) - return msgid; - else - return translation; -} - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static const char * -npgettext_aux (const char *domain, - const char *msg_ctxt_id, const char *msgid, - const char *msgid_plural, unsigned long int n, - int category) -{ - const char *translation = - dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); - if (translation == msg_ctxt_id || translation == msgid_plural) - return (n == 1 ? msgid : msgid_plural); - else - return translation; -} - -/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID - can be arbitrary expressions. But for string literals these macros are - less efficient than those above. */ - -#include <string.h> - -#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ - (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \ - /* || __STDC_VERSION__ >= 199901L */ ) - -#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS -#include <stdlib.h> -#endif - -#define pgettext_expr(Msgctxt, Msgid) \ - dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES) -#define dpgettext_expr(Domainname, Msgctxt, Msgid) \ - dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES) - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static const char * -dcpgettext_expr (const char *domain, - const char *msgctxt, const char *msgid, - int category) -{ - size_t msgctxt_len = strlen (msgctxt) + 1; - size_t msgid_len = strlen (msgid) + 1; - const char *translation; -#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS - char msg_ctxt_id[msgctxt_len + msgid_len]; -#else - char buf[1024]; - char *msg_ctxt_id = - (msgctxt_len + msgid_len <= sizeof (buf) - ? buf - : (char *) malloc (msgctxt_len + msgid_len)); - if (msg_ctxt_id != NULL) -#endif - { - memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); - msg_ctxt_id[msgctxt_len - 1] = '\004'; - memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); - translation = dcgettext (domain, msg_ctxt_id, category); -#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS - if (msg_ctxt_id != buf) - free (msg_ctxt_id); -#endif - if (translation != msg_ctxt_id) - return translation; - } - return msgid; -} - -#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \ - dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) -#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ - dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static const char * -dcnpgettext_expr (const char *domain, - const char *msgctxt, const char *msgid, - const char *msgid_plural, unsigned long int n, - int category) -{ - size_t msgctxt_len = strlen (msgctxt) + 1; - size_t msgid_len = strlen (msgid) + 1; - const char *translation; -#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS - char msg_ctxt_id[msgctxt_len + msgid_len]; -#else - char buf[1024]; - char *msg_ctxt_id = - (msgctxt_len + msgid_len <= sizeof (buf) - ? buf - : (char *) malloc (msgctxt_len + msgid_len)); - if (msg_ctxt_id != NULL) -#endif - { - memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); - msg_ctxt_id[msgctxt_len - 1] = '\004'; - memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); - translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); -#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS - if (msg_ctxt_id != buf) - free (msg_ctxt_id); -#endif - if (!(translation == msg_ctxt_id || translation == msgid_plural)) - return translation; - } - return (n == 1 ? msgid : msgid_plural); -} - -#endif /* _LIBGETTEXT_H */ diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index a41212da..01a7e6c9 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -19,6 +19,8 @@ #ifndef GUESTFS_INTERNAL_H_ #define GUESTFS_INTERNAL_H_ +#include <libintl.h> + #include <rpc/types.h> #include <rpc/xdr.h> @@ -44,14 +46,8 @@ #define STRCASENEQLEN(a,b,n) (strncasecmp((a),(b),(n)) != 0) #define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0) -#ifdef HAVE_GETTEXT -#include "gettext.h" #define _(str) dgettext(PACKAGE, (str)) #define N_(str) dgettext(PACKAGE, (str)) -#else -#define _(str) str -#define N_(str) str -#endif #ifdef HAVE_SYS_SDT_H #include <sys/sdt.h> diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c index 1c8f6f56..91093d84 100644 --- a/test-tool/test-tool.c +++ b/test-tool/test-tool.c @@ -31,24 +31,12 @@ #include <sys/wait.h> #include <locale.h> #include <limits.h> +#include <libintl.h> #include <guestfs.h> -#ifdef HAVE_GETTEXT -#include "gettext.h" #define _(str) dgettext(PACKAGE, (str)) //#define N_(str) dgettext(PACKAGE, (str)) -#else -#define _(str) str -//#define N_(str) str -#endif - -#if !ENABLE_NLS -#undef textdomain -#define textdomain(Domainname) /* empty */ -#undef bindtextdomain -#define bindtextdomain(Domainname, Dirname) /* empty */ -#endif #define STREQ(a,b) (strcmp((a),(b)) == 0) //#define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0) |