X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flocalcharset.c;h=fb4951912885620ca9329a04ac30122254dcb9b5;hb=29dd8b5548ce047ce51ff9a73d6c4b50c9886771;hp=a0f7cca691879bbd6b4f14f7b2e58f11123d87a2;hpb=b1d0cb241323066c0a5cc3ad2d9da1a433263d74;p=gnulib.git

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