diff -uNr log4cxx-0.9.7.orig/include/log4cxx/xml/domconfigurator.h log4cxx-0.9.7/include/log4cxx/xml/domconfigurator.h
--- log4cxx-0.9.7.orig/include/log4cxx/xml/domconfigurator.h	2004-05-10 13:42:04.000000000 +0100
+++ log4cxx-0.9.7/include/log4cxx/xml/domconfigurator.h	2006-03-19 13:15:30.000000000 +0000
@@ -208,7 +208,7 @@
 				spi::LoggerRepositoryPtr& repository);
 
 		protected:
-			String DOMConfigurator::subst(const String& value);
+			String subst(const String& value);
 
 		protected:
 			void * appenderBag;
--- log4cxx-0.9.7.orig/include/log4cxx/helpers/tchar.h	2004-05-10 14:54:50.000000000 +0200
+++ log4cxx-0.9.7/include/log4cxx/helpers/tchar.h	2007-01-17 12:46:44.000000000 +0100
@@ -142,7 +142,9 @@
 	#define _T(x) x
 #endif
 
+#ifndef TCHAR
 	typedef char TCHAR;
+#endif
 	#define totupper toupper
 	#define totlower tolower
 	#define tcout std::cout