From d6bc454fcbb0ffea534f49bfb990422a3f93807c Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sun, 13 Mar 2011 15:36:32 +0100
Subject: 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>
---
 libc/unistd/getopt-susv3.c |  9 +--------
 libc/unistd/getopt.c       | 10 ----------
 2 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'libc/unistd')

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,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',
-- 
cgit v1.2.3