From 10d5e97ca2313cef35bcead91248fb76f634e0ad Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 13 Apr 2008 12:57:48 +0200 Subject: [PATCH] Avoid warning on EMX. --- ChangeLog | 8 +++++++- lib/localcharset.c | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3f115976..44deb66a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ -2008-04-12 Bruno Haible +2008-04-13 Bruno Haible + + * lib/localcharset.c (OS2): Don't redefine if already defined. + Reported by Elbert Pol . + +2008-04-13 Bruno Haible * lib/binary-io.h [__EMX__]: Include . + Reported by Elbert Pol . 2008-04-12 Bruno Haible diff --git a/lib/localcharset.c b/lib/localcharset.c index a0f7cca69..fb4951912 100644 --- a/lib/localcharset.c +++ b/lib/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 General Public License as published by @@ -34,7 +34,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 -- 2.11.0