From 71cdb52799220f8d9052643baf1d3e9836a9c755 Mon Sep 17 00:00:00 2001
From: Thomas Guyot-Sionnest <dermoth@aei.ca>
Date: Thu, 15 Jan 2009 04:22:57 -0500
Subject: Sync with gnulib

---
 gl/localcharset.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gl/localcharset.c')

diff --git a/gl/localcharset.c b/gl/localcharset.c
index 4f319487..68679cf8 100644
--- a/gl/localcharset.c
+++ b/gl/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
-- 
cgit v1.2.3-74-g34f1