aboutsummaryrefslogtreecommitdiff
path: root/gcc/intl.h
diff options
context:
space:
mode:
authorDiego Novillo <dnovillo@google.com>2013-05-08 09:22:14 -0400
committerDiego Novillo <dnovillo@gcc.gnu.org>2013-05-08 09:22:14 -0400
commit4fbfcf44ba41e67136d3f470c98f657335052e84 (patch)
tree22ba12f095a67fffb3ac8c2418dcbdab8d070b43 /gcc/intl.h
parent702d87032825f284efe6a5287c478692e103318c (diff)
downloadgcc-4fbfcf44ba41e67136d3f470c98f657335052e84.zip
gcc-4fbfcf44ba41e67136d3f470c98f657335052e84.tar.gz
gcc-4fbfcf44ba41e67136d3f470c98f657335052e84.tar.bz2
re PR bootstrap/54659 (Bootstrap with --disable-nls broken under Windows)
PR bootstrap/54659 Revert: 2012-08-17 Diego Novillo <dnovillo@google.com> PR bootstrap/54281 * configure.ac: Add libintl.h to AC_CHECK_HEADERS list. * config.in: Regenerate. * configure: Regenerate. * intl.h: Always include libintl.h if HAVE_LIBINTL_H is set. From-SVN: r198711
Diffstat (limited to 'gcc/intl.h')
-rw-r--r--gcc/intl.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/gcc/intl.h b/gcc/intl.h
index 5ea5f5b..e1c6c2b 100644
--- a/gcc/intl.h
+++ b/gcc/intl.h
@@ -26,16 +26,8 @@
# define setlocale(category, locale) (locale)
#endif
-/* If libintl.h is available, include it before testing for NLS. If we
- are building with --disable-nls and another header file includes
- libintl.h, the stubs defined down below will cause syntax errors
- when parsing libintl.h. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54281
- for details. */
-#if defined(HAVE_LIBINTL_H) || defined(ENABLE_NLS)
-# include <libintl.h>
-#endif
-
#ifdef ENABLE_NLS
+#include <libintl.h>
extern void gcc_init_libintl (void);
extern size_t gcc_gettext_width (const char *);
#else