diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-09-27 15:38:43 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:15:52 +0200 |
| commit | ebf8f287451ef01767eef2bd7353bc76834ae8f1 (patch) | |
| tree | 00e1ed87b8eaf51b5740f8ebd8ab7d15474c1eaa /gettext-runtime | |
| parent | 4a37df5139e849b582c29374433fe81a4ca87407 (diff) | |
| download | external_gettext-ebf8f287451ef01767eef2bd7353bc76834ae8f1.zip external_gettext-ebf8f287451ef01767eef2bd7353bc76834ae8f1.tar.gz external_gettext-ebf8f287451ef01767eef2bd7353bc76834ae8f1.tar.bz2 | |
Update from gnulib.
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/intl/localcharset.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index f9c6ab0..b6366a3 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2008-04-13 Bruno Haible <bruno@clisp.org> + + * localcharset.c (OS2): Don't redefine if already defined. + Reported by Elbert Pol <e.pol@chello.nl>. + 2008-09-20 Bruno Haible <bruno@clisp.org> * libgnuintl.h.in: Use (defined X && X) idiom to test whether a diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c index e796ae7..c2029f6 100644 --- a/gettext-runtime/intl/localcharset.c +++ b/gettext-runtime/intl/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008 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 @@ -35,7 +35,9 @@ #if defined __EMX__ /* Assume EMX program runs on OS/2, even if compiled under DOS. */ -# define OS2 +# ifndef OS2 +# define OS2 +# endif #endif #if !defined WIN32_NATIVE |