Always include <libintl.h> for glibc.

diff --git a/malloc/obstack.c b/malloc/obstack.c
index 17c63134315a7a2f318fd12b2b54ea852ad88ee5..38fc02faedaa44615de694c2e178901a4a62965c 100644 (file)
--- a/malloc/obstack.c
+++ b/malloc/obstack.c
@@ -1,5 +1,5 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-1994,96,97,98,99 Free Software Foundation, Inc.
+   Copyright (C) 1988-1994,96,97,98,99,2000 Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.  Its master source is NOT part of
    the C library, however.  The master source lives in /gd/gnu/lib.
@@ -451,7 +451,7 @@ _obstack_memory_used (h)
 \f
 /* Define the error handler.  */
 #ifndef _
-# ifdef HAVE_LIBINTL_H
+# if defined HAVE_LIBINTL_H || defined _LIBC
 #  include <libintl.h>
 #  ifndef _
 #   define _(Str) gettext (Str)

diff --git a/posix/getopt.c b/posix/getopt.c
index a6d2d042c70a78c99bcdbb7cbdd35e0d1ef46b00..c981553c5713309eaf19258c4b1de01f3d639b89 100644 (file)
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -77,9 +77,8 @@
 #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)
 # else