summaryrefslogtreecommitdiffstats
path: root/src/guestfs-internal.h
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-04-30 16:23:05 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-05-01 08:57:55 +0100
commit6aa95e87c1f259589ff9c7812707e4b30b8f6fd7 (patch)
tree46660d96146b7ab15e7b56fe167f68cef65a95ca /src/guestfs-internal.h
parentea74856d953aec39af6ee556221618fda644312f (diff)
downloadlibguestfs-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 'src/guestfs-internal.h')
-rw-r--r--src/guestfs-internal.h8
1 files changed, 2 insertions, 6 deletions
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>