This goes to Jira LOGCXX-401

I have changed the code to match the error message. The existing code tests for 
all 3 macros defined.

diff --git a/src/main/include/log4cxx/logstring.h 
b/src/main/include/log4cxx/logstring.h
index 3bbcdf2..19e8aec 100644
--- a/src/main/include/log4cxx/logstring.h
+++ b/src/main/include/log4cxx/logstring.h
@@ -27,7 +27,7 @@
 #include <string>
 #include <log4cxx/log4cxx.h>
 
-#if LOG4CXX_LOGCHAR_IS_WCHAR && LOG4CXX_LOGCHAR_IS_UTF8 && 
LOG4CXX_LOGCHAR_IS_UNICHAR
+#if (LOG4CXX_LOGCHAR_IS_WCHAR + LOG4CXX_LOGCHAR_IS_UTF8 + 
LOG4CXX_LOGCHAR_IS_UNICHAR)>1
 #error only one of LOG4CXX_LOGCHAR_IS_WCHAR, LOG4CXX_LOGCHAR_IS_UTF8 or 
LOG4CXX_LOGCHAR_IS_UNICHAR may be true
 #endif
 

Reply via email to