2 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index d4cee046c2b..7f7a0074acf 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -50,7 +50,7 @@ IceUtil::ThreadSyscallException::ice_print(ostream& os) const
 	if(ok)
 	{
 	    LPCTSTR msg = (LPCTSTR)lpMsgBuf;
-	    assert(msg && strlen(msg) > 0);
+	    assert(msg && strlen((char*)msg) > 0);
 	    os << msg;
 	    LocalFree(lpMsgBuf);
 	}
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 9ec636057d9..7b2ea932377 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -28,8 +28,13 @@ IceUtil::generateUUID()
 
     UUID uuid;
     UuidCreate(&uuid);
+
+#if _MSC_VER == 1200
+    unsigned char* str;
+#else
+    unsigned short* str;    // Type has changed for some reason in VC++ 2002 (but doc still
+#endif			    // says it's unsigned char *...)
 
-    unsigned char* str;
     UuidToString(&uuid, &str);
 
     string result(reinterpret_cast<char*>(str));