Avoid warning on EMX.

diff --git a/ChangeLog b/ChangeLog
index a3f115976a77578cee7cc212a31e8406ca8b1cc2..44deb66a8942f90960348c1eb5c86bd79dacc939 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
-2008-04-12  Bruno Haible  <bruno@clisp.org>
+2008-04-13  Bruno Haible  <bruno@clisp.org>
+
+       * lib/localcharset.c (OS2): Don't redefine if already defined.
+       Reported by Elbert Pol <e.pol@chello.nl>.
+
+2008-04-13  Bruno Haible  <bruno@clisp.org>
 
        * lib/binary-io.h [__EMX__]: Include <io.h>.
+       Reported by Elbert Pol <e.pol@chello.nl>.
 
 2008-04-12  Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/localcharset.c b/lib/localcharset.c
index a0f7cca691879bbd6b4f14f7b2e58f11123d87a2..fb4951912885620ca9329a04ac30122254dcb9b5 100644 (file)
--- 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