From: Bruno Haible Date: Sat, 27 Sep 2008 15:38:43 +0000 (+0000) Subject: Update from gnulib. X-Git-Tag: v0.18~328 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebf8f287451ef01767eef2bd7353bc76834ae8f1;p=thirdparty%2Fgettext.git Update from gnulib. --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index f9c6ab00d..b6366a342 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2008-04-13 Bruno Haible + + * localcharset.c (OS2): Don't redefine if already defined. + Reported by Elbert Pol . + 2008-09-20 Bruno Haible * 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 e796ae71c..c2029f6ea 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