From 4fbfcf44ba41e67136d3f470c98f657335052e84 Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Wed, 8 May 2013 09:22:14 -0400 Subject: re PR bootstrap/54659 (Bootstrap with --disable-nls broken under Windows) PR bootstrap/54659 Revert: 2012-08-17 Diego Novillo 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 --- gcc/intl.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gcc/intl.h') 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 -#endif - #ifdef ENABLE_NLS +#include extern void gcc_init_libintl (void); extern size_t gcc_gettext_width (const char *); #else -- cgit v1.1