diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-04-30 16:23:05 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-05-01 08:57:55 +0100 |
| commit | 6aa95e87c1f259589ff9c7812707e4b30b8f6fd7 (patch) | |
| tree | 46660d96146b7ab15e7b56fe167f68cef65a95ca /test-tool | |
| parent | ea74856d953aec39af6ee556221618fda644312f (diff) | |
| download | libguestfs-6aa95e87c1f259589ff9c7812707e4b30b8f6fd7.tar.gz libguestfs-6aa95e87c1f259589ff9c7812707e4b30b8f6fd7.tar.xz libguestfs-6aa95e87c1f259589ff9c7812707e4b30b8f6fd7.zip | |
Remove "convenience header" "gettext.h" and use <libintl.h> instead.
gettextize provides a local file called "gettext.h". Remove this and
use <libintl.h> from glibc headers instead.
Most of this change is mechanical: #include <libintl.h> in every C
file which uses any gettext function. But also we remove the
gettext.h file, and adjust the "_" macros.
Note that this effectively removes the ./configure --disable-nls
option, although we don't know if that ever worked.
Diffstat (limited to 'test-tool')
| -rw-r--r-- | test-tool/test-tool.c | 14 |
1 files changed, 1 insertions, 13 deletions
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) |