MacOSX compile fix.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15354 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/docstream.C b/src/support/docstream.C
index b6c592bd61c163bfee9c64860c29e5d1be4d9be1..f67865263ca6d29183d9d96d3fa61199bf8a3bcd 100644 (file)
--- a/src/support/docstream.C
+++ b/src/support/docstream.C
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "docstream.h"
+#include "unicode.h"
 
 #include <cerrno>
 #include <cstdio>
@@ -19,11 +20,6 @@
 
 namespace {
 
-#ifdef WORDS_BIGENDIAN
-char const * ucs4_codeset = "UCS-4BE";
-#else
-char const * ucs4_codeset = "UCS-4LE";
-#endif
 char const * utf8_codeset = "UTF-8";
 
 // We use C IO throughout this file, because the facets might be used with

diff --git a/src/support/unicode.C b/src/support/unicode.C
index 97e88c94fa64f6e9b08399a7b5df7978cd97dc4f..1545e2ddc01b19e0bf9609ec751c9d208e8b6b8c 100644 (file)
--- a/src/support/unicode.C
+++ b/src/support/unicode.C
@@ -23,8 +23,6 @@
 
 using std::endl;
 
-namespace {
-
 #ifdef WORDS_BIGENDIAN
        char const * ucs4_codeset = "UCS-4BE";
        char const * ucs2_codeset = "UCS-2BE";
@@ -33,6 +31,8 @@ namespace {
        char const * ucs2_codeset = "UCS-2LE";
 #endif
 
+namespace {
+
 template<typename RetType, typename InType>
 std::vector<RetType>
 iconv_convert(iconv_t * cd,

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 6af70074eb0c32bbeb38c42c3d8c80046314d828..b7ffa509034f76c750390f5b6d261a9b78bc27e3 100644 (file)
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -61,4 +61,7 @@ ucs4_to_utf8(std::vector<lyx::char_type> const & ucs4str);
 std::vector<char>
 ucs4_to_utf8(lyx::char_type const * ucs4str, size_t ls);
 
+extern char const * ucs4_codeset;
+extern char const * ucs2_codeset;
+
 #endif