re PR other/23541 (All error messages produce segfault)

	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.

From-SVN: r116933

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 7f46066984826ea9512acdd9d445a9ca93089f3b..1b782014e6a2acaf90ac91e87291ee7d00cabc84 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-03-09  Release Manager
 
        * GCC 4.0.3 released.

diff --git a/intl/dgettext.c b/intl/dgettext.c
index cf5b4037f07c6f9346c0809c53e1cdfb2cfb1f21..737e420554fd9505c98c2a5051b65c22faaa298a 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 67fd030f255fc9efc322b5e3db5c050cab46b180..4101c28366d77c970bca25b4d23bab6af6dfe28a 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