Browse Source

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>
Peter S. Mazinger 13 years ago
parent
commit
d6bc454fcb
2 changed files with 1 additions and 18 deletions
  1. 1 8
      libc/unistd/getopt-susv3.c
  2. 0 10
      libc/unistd/getopt.c

+ 1 - 8
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";

+ 0 - 10
libc/unistd/getopt.c

@@ -72,21 +72,11 @@
 # 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',