From c02de4dba472e29fe26df5f392fe713f5ae85ff7 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 13 Sep 2006 22:07:31 +0000 Subject: merge from gcc --- intl/ChangeLog | 12 ++++++++++++ intl/dgettext.c | 5 +++-- intl/dngettext.c | 5 +++-- 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'intl') diff --git a/intl/ChangeLog b/intl/ChangeLog index 6fa7c197e4..7a1b316712 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,15 @@ +2006-09-13 Eric Botcazou + + PR other/23541 + PR other/26507 + Backport from gettext repository: + + 2003-09-04 Bruno Haible + * dgettext.c: Include after gettextP.h, not before. This + ensures that libintl_dcgettext is correctly declared on Solaris. + (Needed because Solaris includes libintl.h.) + * dngettext.c: Likewise, for the libintl_dcngettext declaration. + 2006-06-07 Daniel Jacobowitz * Makefile.in (install-info, install-dvi, install-ps, install-pdf): diff --git a/intl/dgettext.c b/intl/dgettext.c index 1b6ce03882..e497dd9c92 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 #endif +#include "gettextP.h" + #include -#include "gettextP.h" #ifdef _LIBC # include #else diff --git a/intl/dngettext.c b/intl/dngettext.c index 2c304e8dd0..8dee800854 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 #endif +#include "gettextP.h" + #include -#include "gettextP.h" #ifdef _LIBC # include #else -- cgit v1.2.1