merge from gcc

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 6fa7c19..7a1b316 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-13  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       PR other/23541
+       PR other/26507
+       Backport from gettext repository:
+
+       2003-09-04  Bruno Haible  <bruno@clisp.org>
+       * dgettext.c: Include <locale.h> after gettextP.h, not before. This
+       ensures that libintl_dcgettext is correctly declared on Solaris.
+       (Needed because Solaris <locale.h> includes libintl.h.)
+       * dngettext.c: Likewise, for the libintl_dcngettext declaration.
+
 2006-06-07  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * Makefile.in (install-info, install-dvi, install-ps, install-pdf):

diff --git a/intl/dgettext.c b/intl/dgettext.c
index 1b6ce03..e497dd9 100644 (file)
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -20,9 +20,10 @@
 # include <config.h>
 #endif
 
+#include "gettextP.h"
+
 #include <locale.h>
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else

diff --git a/intl/dngettext.c b/intl/dngettext.c
index 2c304e8..8dee800 100644 (file)
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -20,9 +20,10 @@
 # include <config.h>
 #endif
 
+#include "gettextP.h"
+
 #include <locale.h>
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else