Index: src/eval.c
===================================================================
--- src/eval.c	(revision 1104)
+++ src/eval.c	(working copy)
@@ -21975,7 +21975,7 @@
 	ch = *endp;
 	*endp = 0;
 	short_fname = save_fname;
-	len = STRLEN(short_fname) + 1;
+	len = (int)STRLEN(short_fname) + 1;
 	if (get_short_pathname(&short_fname, &pbuf_unused, &len) == FAIL)
 	{
 	    retval = FAIL;
Index: src/if_python.c
===================================================================
--- src/if_python.c	(revision 1104)
+++ src/if_python.c	(working copy)
@@ -1764,7 +1764,7 @@
 
 	if (name == NULL)
 	    name = "";
-	len = strlen(name);
+	len = (int)strlen(name);
 
 	if (len > 45)
 	    name = name + (45 - len);
Index: src/Make_mvc.mak
===================================================================
--- src/Make_mvc.mak	(revision 1104)
+++ src/Make_mvc.mak	(working copy)
@@ -193,10 +193,6 @@
 CPU = i386
 !endif # !PROCESSOR_ARCHITECTURE
 
-!if ("$(CPU)" == "AMD64") || ("$(CPU)" == "IA64")
-DEFINES=$(DEFINES) /Wp64
-!endif
-
 # Build a retail version by default
 
 !if "$(DEBUG)" != "yes"
@@ -211,6 +207,10 @@
 
 !include <Win32.mak>
 
+# Turn on Win64 compatibility warnings for 32-bit compiler in VC8. (/Wp64 is deprecated in VC9.)
+!if ("$(MSVCVER)" == "8.0") 
+DEFINES=$(DEFINES) /Wp64
+!endif
 
 #>>>>> path of the compiler and linker; name of include and lib directories
 # PATH = c:\msvc20\bin;$(PATH)
Index: src/message.c
===================================================================
--- src/message.c	(revision 1104)
+++ src/message.c	(working copy)
@@ -1390,7 +1390,7 @@
 									attr);
 		plain_start = str + 1;
 		msg_puts_attr(s, attr == 0 ? hl_attr(HLF_8) : attr);
-		retval += STRLEN(s);
+		retval += (int)STRLEN(s);
 	    }
 	    else
 		++retval;