diff --exclude='*~' -urN log4cxx-0.9.7.orig/include/log4cxx/helpers/class.h log4cxx-0.9.7/include/log4cxx/helpers/class.h
--- log4cxx-0.9.7.orig/include/log4cxx/helpers/class.h	2005-03-16 02:27:08.783682464 -0500
+++ log4cxx-0.9.7/include/log4cxx/helpers/class.h	2005-03-16 02:27:26.479992216 -0500
@@ -53,6 +53,7 @@
 		{
 		public:
 			Class(const String& name);
+			virtual ~Class() {};
 			virtual ObjectPtr newInstance() const;
 			const String& toString() const;
 			const String& getName() const;
diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/msxml.cpp log4cxx-0.9.7/src/msxml.cpp
--- log4cxx-0.9.7.orig/src/msxml.cpp	2005-03-16 02:27:08.733690064 -0500
+++ log4cxx-0.9.7/src/msxml.cpp	2005-03-16 02:27:38.852111368 -0500
@@ -289,4 +289,5 @@
 	}
 }
 
-#endif
\ No newline at end of file
+#endif
+
diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/smtpappender.cpp log4cxx-0.9.7/src/smtpappender.cpp
--- log4cxx-0.9.7.orig/src/smtpappender.cpp	2005-03-16 02:27:08.725691280 -0500
+++ log4cxx-0.9.7/src/smtpappender.cpp	2005-03-16 02:27:38.853111216 -0500
@@ -134,7 +134,7 @@
 	for (i = recipients.begin(); i != recipients.end(); i++)
 	{
 		if (::libsmtp_add_recipient(LIBSMTP_REC_TO,
-			(TCHAR *)T2A(i->c_str()),
+			T2A((TCHAR *)i->c_str()),
 			(libsmtp_session_struct *)session) != 0)
 		{
 			LogLog::error(_T("Could not add recipient ")+*i+_T("."));
@@ -316,6 +316,8 @@
 */
 void SMTPAppender::sendBuffer()
 {
+	USES_CONVERSION;
+
 	// Note: this code already owns the monitor for this
 	// appender. This frees us from needing to synchronize on 'cb'.
 	try
diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/stringtokenizer.cpp log4cxx-0.9.7/src/stringtokenizer.cpp
--- log4cxx-0.9.7.orig/src/stringtokenizer.cpp	2005-03-16 02:27:08.727690976 -0500
+++ log4cxx-0.9.7/src/stringtokenizer.cpp	2005-03-16 02:27:26.480992064 -0500
@@ -39,7 +39,7 @@
 
 StringTokenizer::~StringTokenizer()
 {
-	delete this->str;
+	delete[] this->str;
 }
 
 bool StringTokenizer::hasMoreTokens() const