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 /fuse | |
| 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 'fuse')
| -rw-r--r-- | fuse/guestmount.c | 1 | ||||
| -rw-r--r-- | fuse/guestmount.h | 8 |
2 files changed, 2 insertions, 7 deletions
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) |