summaryrefslogtreecommitdiffstats
path: root/fish
diff options
context:
space:
mode:
Diffstat (limited to 'fish')
-rw-r--r--fish/alloc.c1
-rw-r--r--fish/config.c1
-rw-r--r--fish/copy.c1
-rw-r--r--fish/display.c1
-rw-r--r--fish/edit.c1
-rw-r--r--fish/events.c1
-rw-r--r--fish/fish.c1
-rw-r--r--fish/fish.h13
-rw-r--r--fish/glob.c1
-rw-r--r--fish/help.c1
-rw-r--r--fish/hexedit.c1
-rw-r--r--fish/inspect.c1
-rw-r--r--fish/keys.c1
-rw-r--r--fish/lcd.c1
-rw-r--r--fish/man.c1
-rw-r--r--fish/more.c1
-rw-r--r--fish/options.c2
-rw-r--r--fish/options.h10
-rw-r--r--fish/prep.c1
-rw-r--r--fish/prep_boot.c1
-rw-r--r--fish/prep_disk.c1
-rw-r--r--fish/prep_fs.c1
-rw-r--r--fish/prep_lv.c1
-rw-r--r--fish/prep_part.c1
-rw-r--r--fish/rc.c1
-rw-r--r--fish/reopen.c1
-rw-r--r--fish/setenv.c1
-rw-r--r--fish/supported.c1
-rw-r--r--fish/time.c1
29 files changed, 28 insertions, 23 deletions
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"
diff --git a/fish/lcd.c b/fish/lcd.c
index 69c684e0..19c66130 100644
--- a/fish/lcd.c
+++ b/fish/lcd.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <libintl.h>
#include "fish.h"
diff --git a/fish/man.c b/fish/man.c
index 7d0318cc..a7106079 100644
--- a/fish/man.c
+++ b/fish/man.c
@@ -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"
diff --git a/fish/rc.c b/fish/rc.c
index 8674bdf4..14c9d597 100644
--- a/fish/rc.c
+++ b/fish/rc.c
@@ -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"
generated by cgit (git 2.34.1) at 2024-11-19 22:33:44 +0000