You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2006/03/07 08:36:02 UTC
svn commit: r383813 - in /logging/log4cxx/trunk:
include/log4cxx/private/log4cxx_private.hw src/systemerrwriter.cpp
src/systemoutwriter.cpp
Author: carnold
Date: Mon Mar 6 23:36:01 2006
New Revision: 383813
URL: http://svn.apache.org/viewcvs?rev=383813&view=rev
Log:
Bug LOGCXX-126: ConsoleAppender uses fputws when LOG4CXX_FORCE_WIDE_CONSOLE is true
Modified:
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw
logging/log4cxx/trunk/src/systemerrwriter.cpp
logging/log4cxx/trunk/src/systemoutwriter.cpp
Modified: logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw
URL: http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw?rev=383813&r1=383812&r2=383813&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw (original)
+++ logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw Mon Mar 6 23:36:01 2006
@@ -55,6 +55,7 @@
#define LOG4CXX_HAS_STD_WCOUT 1
#define LOG4CXX_HAS_STD_WLOCALE 1
+#define LOG4CXX_FORCE_WIDE_CONSOLE 1
#if defined(LOG4CXX_STATIC)
#define LOG4CXX_EXPORT
Modified: logging/log4cxx/trunk/src/systemerrwriter.cpp
URL: http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/systemerrwriter.cpp?rev=383813&r1=383812&r2=383813&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/systemerrwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemerrwriter.cpp Mon Mar 6 23:36:01 2006
@@ -37,10 +37,7 @@
void SystemErrWriter::write(const LogString& str, Pool& p) {
#if LOG4CXX_HAS_WCHAR_T
-#if defined(_MSC_VER)
- // MSC_VER has fwide, but since all supported versions
- // allow intermixing of wide and byte output
- // use wide to support widest range of languages
+#if LOG4CXX_FORCE_WIDE_CONSOLE
if (true) {
#else
if (fwide(stderr, 0) > 0) {
@@ -48,8 +45,6 @@
LOG4CXX_ENCODE_WCHAR(msg, str);
fputws(msg.c_str(), stderr);
} else {
-#else
- {
#endif
LOG4CXX_ENCODE_CHAR(msg, str);
fputs(msg.c_str(), stderr);
Modified: logging/log4cxx/trunk/src/systemoutwriter.cpp
URL: http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/systemoutwriter.cpp?rev=383813&r1=383812&r2=383813&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/systemoutwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemoutwriter.cpp Mon Mar 6 23:36:01 2006
@@ -38,10 +38,7 @@
void SystemOutWriter::write(const LogString& str, Pool& p) {
#if LOG4CXX_HAS_WCHAR_T
-#if defined(_MSC_VER)
- // MSC_VER has fwide, but since all supported versions
- // allow intermixing of wide and byte output
- // use wide to support widest range of languages
+#if LOG4CXX_FORCE_WIDE_CONSOLE
if (true) {
#else
if (fwide(stdout, 0) > 0) {