merge from gcc

4 files changed, 29 insertions, 15 deletions

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 6fa7c197e41..7a1b3167128 100644
--- 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 1b6ce038820..e497dd9c920 100644
--- 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 2c304e8dd0a..8dee8008544 100644
--- 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
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 506cb8bcb6c..0705a14a5f0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -68,19 +68,19 @@
 
 2006-03-29  Jim Blandy  <jimb@codesourcery.com>
 
- 	* pex-common.c (pex_input_file, pex_input_pipe): New functions.
+	* pex-common.c (pex_input_file, pex_input_pipe): New functions.
 	(pex_init_common): Initialize obj->input_file.
 	(pex_run): Close any file opened by pex_input_file.
- 	* pexecute.txh (pex_input_file, pex_input_pipe): New docs.
- 	* pex-common.h (struct pex_obj): New field input_file.
+	* pexecute.txh (pex_input_file, pex_input_pipe): New docs.
+	* pex-common.h (struct pex_obj): New field input_file.
 	(struct pex_funcs): New function ptr fdopenw.
- 	* pex-unix.c (pex_unix_fdopenw): New function.
- 	(funcs): List it as our fdopenw function.
- 	* pex-win32.c (pex_win32_fdopenw): New function.
- 	(funcs): List it as our fdopenw function.
- 	* pex-djgpp.c (funcs): Leave fdopenw null.
- 	* pex-msdos (funcs): Same.
- 	* functions.texi: Regenerated.
+	* pex-unix.c (pex_unix_fdopenw): New function.
+	(funcs): List it as our fdopenw function.
+	* pex-win32.c (pex_win32_fdopenw): New function.
+	(funcs): List it as our fdopenw function.
+	* pex-djgpp.c (funcs): Leave fdopenw null.
+	* pex-msdos (funcs): Same.
+	* functions.texi: Regenerated.
 
 2006-04-10  Jim Blandy  <jimb@codesourcery.com>
 
@@ -6803,7 +6803,7 @@ Wed Aug 19 14:40:34 1992  Ian Lance Taylor  (ian@cygnus.com)
 
 Mon Aug 10 17:33:40 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
-       * Makefile.in: clean up definition of CFILES, more comments
+	* Makefile.in: clean up definition of CFILES, more comments
 
 Sat Aug  8 23:10:59 1992  Fred Fish  (fnf@cygnus.com)