PR other/23541

PR other/26507 Backport from gettext repository: 2003-09-04 Bruno Haible <[email protected]> * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116931 138bc75d-0d04-0410-961f-82ee72b054a4
erinsybouts · Sep 13, 2006 · 21d7768 · 21d7768
1 parent f55abd0
commit 21d7768
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/intl/ChangeLog b/intl/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-13  Eric Botcazou  <[email protected]>
+
+	PR other/23541
+	PR other/26507
+	Backport from gettext repository:
+
+	2003-09-04  Bruno Haible  <[email protected]>
+	* 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  <[email protected]>
 
 	* Makefile.in (install-info, install-dvi, install-ps, install-pdf):

diff --git 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
@@ -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