diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-13 15:36:32 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:23 +0200 |
| commit | d6bc454fcbb0ffea534f49bfb990422a3f93807c (patch) | |
| tree | 0ab20ed02bf4a7c3c1486ba102eac3420b18e83c | |
| parent | 9b7e3299c3ad789e60e093312f7360999e64e676 (diff) | |
getopt[-susv3].c: use libintl's _(x)
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | libc/unistd/getopt-susv3.c | 9 | ||||
| -rw-r--r-- | libc/unistd/getopt.c | 10 |
2 files changed, 1 insertions, 18 deletions
diff --git a/libc/unistd/getopt-susv3.c b/libc/unistd/getopt-susv3.c index d7b8d0dca..49f9626bc 100644 --- a/libc/unistd/getopt-susv3.c +++ b/libc/unistd/getopt-susv3.c @@ -22,14 +22,7 @@ #include <string.h> #include <stdio.h> #include <getopt.h> - - -#ifdef __UCLIBC_MJN3_ONLY__ -#warning TODO: Enable gettext awareness. -#endif /* __UCLIBC_MJN3_ONLY__ */ - -#undef _ -#define _(X) X +#include <libintl.h> #ifdef __BCC__ static const char missing[] = "option requires an argument"; diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c index f1ee0f462..a709b424a 100644 --- a/libc/unistd/getopt.c +++ b/libc/unistd/getopt.c @@ -72,22 +72,12 @@ # include <unixlib.h> #endif -#if !defined __UCLIBC__ && !defined __UCLIBC_HAS_GETTEXT_AWARENESS__ #ifdef _LIBC # include <libintl.h> #else # include "gettext.h" # define _(msgid) gettext (msgid) #endif -#else -#ifdef __UCLIBC_MJN3_ONLY__ -#warning TODO: Enable gettext awareness. -#endif /* __UCLIBC_MJN3_ONLY__ */ - -#undef _ -#define _(X) X - -#endif /* Treat '-W foo' the same as the long option '--foo', * disabled for the moment since it costs about 2k... */ |