Imported Upstream version 1.21

[tar] / lib / localcharset.c

diff --git a/lib/localcharset.c b/lib/localcharset.c
index 9785370734adb488c6dae1c22c117a18fd8de295..f49d75b92927531b60d87864756e6b1ef52e9b3e 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -2,7 +2,7 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* 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
@@ -36,7 +36,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