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>

diff --git a/libc/unistd/getopt-susv3.c b/libc/unistd/getopt-susv3.c
index d7b8d0d..49f9626 100644 (file)
--- 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 f1ee0f4..a709b42 100644 (file)
--- 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... */