Author: carnold
Date: Mon Mar 6 23:10:10 2006
New Revision: 383809
URL: http://svn.apache.org/viewcvs?rev=383809&view=rev
Log:
Bug LOGCXX-126: ConsoleAppender always uses fputws with MSVC
Modified:
logging/log4cxx/trunk/src/systemerrwriter.cpp
logging/log4cxx/trunk/src/systemoutwriter.cpp
Modified: logging/log4cxx/trunk/src/systemerrwriter.cpp
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/systemerrwriter.cpp?rev=383809&r1=383808&r2=383809&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/systemerrwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemerrwriter.cpp Mon Mar 6 23:10:10 2006
@@ -37,7 +37,14 @@
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 (true) {
+#else
if (fwide(stderr, 0) > 0) {
+#endif
LOG4CXX_ENCODE_WCHAR(msg, str);
fputws(msg.c_str(), stderr);
} else {
Modified: logging/log4cxx/trunk/src/systemoutwriter.cpp
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/systemoutwriter.cpp?rev=383809&r1=383808&r2=383809&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/systemoutwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemoutwriter.cpp Mon Mar 6 23:10:10 2006
@@ -38,7 +38,14 @@
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 (true) {
+#else
if (fwide(stdout, 0) > 0) {
+#endif
LOG4CXX_ENCODE_WCHAR(msg, str);
fputws(msg.c_str(), stdout);
} else {
