Re: Os2

[Bruno Haible]

Elbert Pol wrote:

> localcharset.c:37:1: warning: "OS2" redefined
> <command line>:20:1: warning: this is the location of the previous definition

I'm fixing this warning:


2008-04-13  Bruno Haible  <address@hidden>

        * lib/localcharset.c (OS2): Don't redefine if already defined.
        Reported by Elbert Pol <address@hidden>.

--- lib/localcharset.c.orig     2008-04-13 12:57:21.000000000 +0200
+++ lib/localcharset.c  2008-04-13 12:54:50.000000000 +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