# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1208084268 -7200
# Node ID 09359378ead641e3e15aaa9fd8fddcbc292908a2
# Parent  f2fd1d89ec4b2b708c8f9145cefc0a08e3f80d9e
Avoid warning on EMX.

diff -r f2fd1d89ec4b -r 09359378ead6 ChangeLog
--- a/ChangeLog	Sun Apr 13 12:50:49 2008 +0200
+++ b/ChangeLog	Sun Apr 13 12:57:48 2008 +0200
@@ -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 -r f2fd1d89ec4b -r 09359378ead6 lib/localcharset.c
--- a/lib/localcharset.c	Sun Apr 13 12:50:49 2008 +0200
+++ b/lib/localcharset.c	Sun Apr 13 12:57:48 2008 +0200
@@ -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