diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.h | 6 | ||||
| -rw-r--r-- | include/libintl.h | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/include/features.h b/include/features.h index e9227bfca0..822fe4987b 100644 --- a/include/features.h +++ b/include/features.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993,1995-2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993,1995-2003,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -181,8 +181,8 @@ /* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2 (and IEEE Std 1003.1b-1993 unless _XOPEN_SOURCE is defined). */ -#if (!defined __STRICT_ANSI__ && !defined _POSIX_SOURCE && \ - !defined _POSIX_C_SOURCE) +#if ((!defined __STRICT_ANSI__ || (_XOPEN_SOURCE - 0) >= 500) && \ + !defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE) # define _POSIX_SOURCE 1 # if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 500 # define _POSIX_C_SOURCE 2 diff --git a/include/libintl.h b/include/libintl.h index 8f312f1042..20083d4264 100644 --- a/include/libintl.h +++ b/include/libintl.h @@ -41,7 +41,7 @@ extern char *__bind_textdomain_codeset (__const char *__domainname, __const char *__codeset); extern const char _libc_intl_domainname[]; -extern const char _libc_intl_domainname_internal[] attribute_hidden; +libc_hidden_proto (_libc_intl_domainname) /* Define the macros `_' and `N_' for conveniently marking translatable strings in the libc source code. We have to make sure we get the @@ -52,12 +52,7 @@ extern const char _libc_intl_domainname_internal[] attribute_hidden; # undef _ /* This is defined as an optimizing macro, so use it. */ -# if !defined NOT_IN_libc && defined SHARED -# define _(msgid) \ - __dcgettext_internal (_libc_intl_domainname_internal, msgid, LC_MESSAGES) -# else -# define _(msgid) \ +# define _(msgid) \ __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES) -#endif #endif |