[Libreoffice-commits] .: Branch 'libreoffice-3-4' - i18nutil/source

[Petr Mladek]

 i18nutil/source/utility/unicode.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 3bf568fb0341c84dd125ebcd3582d3e6741fed1f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 16:01:44 2011 +0200

    i18nutil-glibc-braindamage-workaround.diff: build failure with glibc-2.4
    
    glibc 2.4's langinfo.h does "#define CURRENCY_SYMBOL __CURRENCY_SYMBOL"
    which (obviously) breaks UnicodeType::CURRENCY_SYMBOL

diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 0234e1f..27ceb55 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -31,6 +31,11 @@
 #include <i18nutil/unicode.hxx>
 #include "unicode_data.h"
 
+// Workaround for glibc braindamage:
+// glibc 2.4's langinfo.h does "#define CURRENCY_SYMBOL __CURRENCY_SYMBOL"
+// which (obviously) breaks UnicodeType::CURRENCY_SYMBOL
+#undef CURRENCY_SYMBOL
+
 using namespace ::com::sun::star::i18n;
 
 static ScriptTypeList defaultTypeList[] = {