Fix for aliasing problem reported by Michael Matz.

[pf3gnuchains/gcc-fork.git] / gcc / intl.h

diff --git a/gcc/intl.h b/gcc/intl.h
index 57d44a8..80a945b 100644 (file)
--- a/gcc/intl.h
+++ b/gcc/intl.h
@@ -1,5 +1,5 @@
 /* intl.h - internationalization
-   Copyright 1998, 2001 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
@@ -27,19 +27,10 @@
 # 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
-extern void gcc_init_libintl PARAMS ((void));
-extern size_t gcc_gettext_width PARAMS ((const char *));
+#include <libintl.h>
+extern void gcc_init_libintl (void);
+extern size_t gcc_gettext_width (const char *);
 #else
 /* Stubs.  */
 # undef textdomain
@@ -49,6 +40,7 @@ extern size_t gcc_gettext_width PARAMS ((const char *));
 # undef gettext
 # define gettext(msgid) (msgid)
 # define gcc_init_libintl()    /* nothing */
+# define gcc_gettext_width(s) strlen(s)
 #endif
 
 #ifndef _
@@ -56,7 +48,7 @@ extern size_t gcc_gettext_width PARAMS ((const char *));
 #endif
 
 #ifndef N_
-# define N_(msgid) (msgid)
+# define N_(msgid) msgid
 #endif
 
 #endif /* intl.h */