X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fintl.h;h=3acc511cc07aadfa97d0809e9b55e4d784d931fd;hb=4bfa91368ed3743e594de777d9a465da7345164a;hp=07b72b59bb1b1ccb9b0ad8038f7b1fcc4960b586;hpb=ab6d34f74d478967d457be3498f798a07cb7bd41;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/intl.h b/gcc/intl.h
index 07b72b59bb1..3acc511cc07 100644
--- a/gcc/intl.h
+++ b/gcc/intl.h
@@ -1,5 +1,5 @@
 /* intl.h - internationalization
-   Copyright 1998 Free Software Foundation, Inc.
+   Copyright 1998, 2001, 2003 Free Software Foundation, Inc.
 
    GCC is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,6 +16,9 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
+#ifndef GCC_INTL_H
+#define GCC_INTL_H
+
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
@@ -24,23 +27,29 @@
 # define setlocale(category, locale) (locale)
 #endif
 
-#ifdef ENABLE_NLS
-# include <libintl.h>
-  extern const char localedir[];
+#ifdef USE_INCLUDED_LIBINTL
+# include <intl/libgnuintl.h>
 #else
-/* Stubs that do something close enough.  */
-# ifdef textdomain
-#  undef textdomain
+# ifdef HAVE_LIBINTL_H
+#  include <libintl.h>
+# else
+#  undef ENABLE_NLS
 # endif
+#endif
+
+#ifdef ENABLE_NLS
+extern void gcc_init_libintl (void);
+extern size_t gcc_gettext_width (const char *);
+#else
+/* Stubs.  */
+# undef textdomain
 # define textdomain(domain) (domain)
-# ifdef bindtextdomain
-#  undef bindtextdomain
-# endif
+# undef bindtextdomain
 # define bindtextdomain(domain, directory) (domain)
-# ifdef gettext
-#  undef gettext
-# endif
+# undef gettext
 # define gettext(msgid) (msgid)
+# define gcc_init_libintl()	/* nothing */
+# define gcc_gettext_width(s) strlen(s)
 #endif
 
 #ifndef _
@@ -50,3 +59,5 @@
 #ifndef N_
 # define N_(msgid) (msgid)
 #endif
+
+#endif /* intl.h */