diff options
| author | DJ Delorie <dj@delorie.com> | 2006-09-13 22:07:31 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2006-09-13 22:07:31 +0000 |
| commit | 3fe62daa8067ee5aaafda2769c62da38eb37a738 (patch) | |
| tree | 8e3495e4e3e39e2f5e4548dbee46686e13d3cd4e /intl | |
| parent | 2d9de0e9e99f496fa4bd8573c296f53b23211000 (diff) | |
| download | gdb-3fe62daa8067ee5aaafda2769c62da38eb37a738.tar.gz | |
merge from gcc
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/ChangeLog | 12 | ||||
| -rw-r--r-- | intl/dgettext.c | 5 | ||||
| -rw-r--r-- | intl/dngettext.c | 5 |
3 files changed, 18 insertions, 4 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 |