Imported gcc-4.4.3

[msp430-gcc.git] / gcc / intl.h

diff --git a/gcc/intl.h b/gcc/intl.h
index 8a9b35a66fd97425e20dca39de9abdae0d92284e..3b6395f367dde6160b7b1df1e323d3313b0cf6a4 100644 (file)
--- a/gcc/intl.h
+++ b/gcc/intl.h
@@ -1,9 +1,9 @@
 /* intl.h - internationalization
 /* intl.h - internationalization

-   Copyright 1998, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 2001, 2003, 2004, 2007 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
 
    GCC is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GCC is distributed in the hope that it will be useful,
    any later version.
 
    GCC is distributed in the hope that it will be useful,


@@ -12,9 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   along with GCC; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */

 
 #ifndef GCC_INTL_H
 #define GCC_INTL_H
 
 #ifndef GCC_INTL_H
 #define GCC_INTL_H


@@ -27,18 +26,10 @@
 # define setlocale(category, locale) (locale)
 #endif
 
 # define setlocale(category, locale) (locale)
 #endif
 

-#ifdef USE_INCLUDED_LIBINTL
-# include <intl/libgnuintl.h>
-#else
-# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-# else
-#  undef ENABLE_NLS
-# endif
-#endif
-

 #ifdef ENABLE_NLS
 #ifdef ENABLE_NLS

-extern void gcc_init_libintl PARAMS ((void));
+#include <libintl.h>
+extern void gcc_init_libintl (void);
+extern size_t gcc_gettext_width (const char *);

 #else
 /* Stubs.  */
 # undef textdomain
 #else
 /* Stubs.  */
 # undef textdomain


@@ -48,6 +39,7 @@ extern void gcc_init_libintl PARAMS ((void));
 # undef gettext
 # define gettext(msgid) (msgid)
 # define gcc_init_libintl()    /* nothing */
 # undef gettext
 # define gettext(msgid) (msgid)
 # define gcc_init_libintl()    /* nothing */

+# define gcc_gettext_width(s) strlen(s)

 #endif
 
 #ifndef _
 #endif
 
 #ifndef _


@@ -55,7 +47,14 @@ extern void gcc_init_libintl PARAMS ((void));
 #endif
 
 #ifndef N_
 #endif
 
 #ifndef N_

-# define N_(msgid) (msgid)
+# define N_(msgid) msgid

 #endif
 
 #endif
 

+#ifndef G_
+# define G_(gmsgid) gmsgid
+#endif
+
+extern const char *open_quote;
+extern const char *close_quote;
+

 #endif /* intl.h */
 #endif /* intl.h */