diff --git a/msvcc.sh b/msvcc.sh
index f570eb0f..27fafae1 100755
--- a/msvcc.sh
+++ b/msvcc.sh
@@ -171,7 +171,15 @@ do
       shift 1
     ;;
     -l*)
-      linkargs="$linkargs lib${1#-l}.a}"
+      case $1
+      in
+          -lffi)
+	      linkargs="$linkargs lib${1#-l}.a"
+	      ;;
+	  *)
+	      linkargs="$linkargs ${1#-l}.lib"
+	      ;;
+      esac
       shift 1
     ;;
     -W|-Wextra)
diff --git a/testsuite/libffi.call/ffitest.h b/testsuite/libffi.call/ffitest.h
index 5e194511..a823cfe3 100644
--- a/testsuite/libffi.call/ffitest.h
+++ b/testsuite/libffi.call/ffitest.h
@@ -79,12 +79,14 @@
 #define PRIdLL "ld"
 #undef PRIuLL
 #define PRIuLL "lu"
+#ifndef _MSC_VER
 #define PRId8 "hd"
 #define PRIu8 "hu"
 #define PRId64 "ld"
 #define PRIu64 "lu"
 #define PRIuPTR "lu"
 #endif
+#endif
 
 /* PA HP-UX kludge.  */
 #if defined(__hppa__) && defined(__hpux__) && !defined(PRIuPTR)