From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Sun, 4 Mar 2007 13:04:18 +0000 (+0000)
Subject: Use only one codeset definition
X-Git-Tag: 1.6.10~10630
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a9266cbdf0f0a75bffc0b1a73a788c28337ccc80;p=features.git

Use only one codeset definition


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

diff --git a/src/client/messages.C b/src/client/messages.C
index 0f140dcdba..6ec3716026 100644
--- a/src/client/messages.C
+++ b/src/client/messages.C
@@ -13,6 +13,7 @@
 #include "debug.h"
 #include "support/filetools.h"
 #include "support/package.h"
+#include "support/unicode.h"
 
 #include <boost/current_function.hpp>
 
@@ -122,16 +123,11 @@ public:
 				<< "Rtn value : " << c << endl;
 		}
 
-#ifdef WORDS_BIGENDIAN
-		static const char * codeset = "UCS-4BE";
-#else
-		static const char * codeset = "UCS-4LE";
-#endif
-		if (!bind_textdomain_codeset(PACKAGE, codeset)) {
+		if (!bind_textdomain_codeset(PACKAGE, ucs4_codeset)) {
 			lyxerr[Debug::DEBUG]
 				<< BOOST_CURRENT_FUNCTION << '\n'
 				<< "Error code: " << errno << '\n'
-				<< "Codeset   : " << codeset << '\n'
+				<< "Codeset   : " << ucs4_codeset << '\n'
 				<< endl;
 		}
 
diff --git a/src/messages.C b/src/messages.C
index 3a628fe9bf..d1f8381fb2 100644
--- a/src/messages.C
+++ b/src/messages.C
@@ -17,7 +17,7 @@
 #include "support/environment.h"
 #include "support/filetools.h"
 #include "support/package.h"
-#include "support/types.h"
+#include "support/unicode.h"
 
 #include <boost/current_function.hpp>
 #include <boost/regex.hpp>
@@ -52,12 +52,6 @@ using support::getEnv;
 using support::setEnv;
 
 
-#ifdef WORDS_BIGENDIAN
-		char const * codeset = "UCS-4BE";
-#else
-		char const * codeset = "UCS-4LE";
-#endif
-
 // This version use the traditional gettext.
 Messages::Messages(string const & l)
 	: lang_(l), warned_(false)
@@ -129,11 +123,11 @@ docstring const Messages::get(string const & m) const
 			<< "Rtn value : " << c << endl;
 	}
 
-	if (!bind_textdomain_codeset(PACKAGE, codeset)) {
+	if (!bind_textdomain_codeset(PACKAGE, ucs4_codeset)) {
 		lyxerr[Debug::DEBUG]
 		<< BOOST_CURRENT_FUNCTION << '\n'
 			<< "Error code: " << errno << '\n'
-			<< "Codeset   : " << codeset << '\n'
+			<< "Codeset   : " << ucs4_codeset << '\n'
 			<< endl;
 	}