From 92028edb8d31a2d62bc12cab608bf438beaa4e4d Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 13 Sep 2006 23:24:04 +0200 Subject: [PATCH] re PR other/23541 (All error messages produce segfault) 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. From-SVN: r116933 --- intl/ChangeLog | 12 ++++++++++++ intl/dgettext.c | 5 +++-- intl/dngettext.c | 5 +++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/intl/ChangeLog b/intl/ChangeLog index 7f4606698482..1b782014e6a2 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-03-09 Release Manager * GCC 4.0.3 released. diff --git a/intl/dgettext.c b/intl/dgettext.c index cf5b4037f07c..737e420554fd 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 67fd030f255f..4101c28366d7 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 -- 2.47.2