Update from gnulib.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index f9c6ab00d552d62169d14dcd8e899b45a91a1720..b6366a342fc08d4013ce6ccee249138d0244bd61 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-13  Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c (OS2): Don't redefine if already defined.
+       Reported by Elbert Pol <e.pol@chello.nl>.
+
 2008-09-20  Bruno Haible  <bruno@clisp.org>
 
        * libgnuintl.h.in: Use (defined X && X) idiom to test whether a

diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index e796ae71c5dac9140a88ec7b90138c3c9dfd6e17..c2029f6ea58d82e91606cb8871dd6a098dcf0c73 100644 (file)
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/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 Library General Public License as published
@@ -35,7 +35,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