Update from libc.

diff --git a/lib/getopt.c b/lib/getopt.c
index a5bc2c95e65940b941d2178ccc2afbdca6d026a2..e852127f626003de9d997f6c16b6490449334dd3 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -75,11 +75,12 @@
 #endif
 
 #ifndef _
-/* This is for other GNU distributions with internationalized messages.
-   When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
+/* This is for other GNU distributions with internationalized messages.  */
+# if defined HAVE_LIBINTL_H || defined _LIBC
 #  include <libintl.h>
-#  define _(msgid)     gettext (msgid)
+#  ifndef _
+#   define _(msgid)    gettext (msgid)
+#  endif
 # else
 #  define _(msgid)     (msgid)
 # endif