diff -u3 -Hb -r CVS-latest/src/af/util/win/ut_Win32Misc.cpp ./src/af/util/win/ut_Win32Misc.cpp
--- CVS-latest/src/af/util/win/ut_Win32Misc.cpp	Fri Apr 16 07:22:08 2004
+++ ./src/af/util/win/ut_Win32Misc.cpp	Sun May 23 16:36:16 2004
@@ -41,7 +41,7 @@

     ULARGE_INTEGER _100ns = {ft.dwLowDateTime,ft.dwHighDateTime};

-    _100ns.QuadPart -= 0x19db1ded53e8000;
+    _100ns.QuadPart -= 0x19db1ded53e8000ULL;

     tv->tv_sec = long (_100ns.QuadPart / (10000 * 1000));
     tv->tv_usec = (long) ((_100ns.LowPart % (DWORD) (10000 * 1000)) / 10);
diff -u3 -Hb -r CVS-latest/src/af/xap/win/xap_Win32App.cpp ./src/af/xap/win/xap_Win32App.cpp
--- CVS-latest/src/af/xap/win/xap_Win32App.cpp	Mon Apr 19 11:58:44 2004
+++ ./src/af/xap/win/xap_Win32App.cpp	Sun May 23 17:43:52 2004
@@ -489,7 +489,7 @@
 #if defined(__MINGW32__) && (__W32API_MAJOR_VERSION == 2 && __W32API_MINOR_VERSION < 4)
 	gcpResult.lpGlyphs = (UINT *) glyphArray;    // Character glyphs
 #else
-	gcpResult.lpGlyphs = (unsigned short *) glyphArray;    // Character glyphs
+	gcpResult.lpGlyphs = (LPWSTR) glyphArray;    // Character glyphs
 #endif
 	gcpResult.nGlyphs = 2;              // Array size

diff -u3 -Hb -r CVS-latest/src/af/xap/win/xap_Win32Slurp.cpp ./src/af/xap/win/xap_Win32Slurp.cpp
--- CVS-latest/src/af/xap/win/xap_Win32Slurp.cpp	Mon Dec 29 13:42:46 2003
+++ ./src/af/xap/win/xap_Win32Slurp.cpp	Sun May 23 18:19:29 2004
@@ -154,7 +154,7 @@
 	// the "TopicName" must match the value in the key:
 	// HKEY_CLASSES_ROOT\<xxx>\shell\open\ddeexec\topic

-	m_hszServerName = DdeCreateStringHandle(m_idDdeServerInst, m_pApp->getApplicationName(), CP_WINANSI);
+	m_hszServerName = DdeCreateStringHandle(m_idDdeServerInst, (LPTSTR)m_pApp->getApplicationName(), CP_WINANSI);
 	m_hszTopic = DdeCreateStringHandle(m_idDdeServerInst, MY_DDE_TOPICNAME, CP_WINANSI);

 	// register the server Name