Index: dbus/dbus-sysdeps-util-win.c
===================================================================
--- dbus/dbus-sysdeps-util-win.c	(revision 627)
+++ dbus/dbus-sysdeps-util-win.c	(working copy)
@@ -51,20 +51,20 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#ifdef __MINGW32__
+#if defined __MINGW32__ || (defined _MSC_VER && _MSC_VER <= 1310)
 /* save string functions version
    using DBusString needs to much time because of uncommon api 
 */ 
 #define errno_t int
 
-errno_t strcat_s(char *dest, int size, char *src) 
+errno_t strcat_s(char *dest, size_t size, char *src) 
 {
   _dbus_assert(strlen(dest) + strlen(src) +1 <= size);
   strcat(dest,src);
   return 0;
 }
 
-errno_t strcpy_s(char *dest, int size, char *src)
+errno_t strcpy_s(char *dest, size_t size, char *src)
 {
   _dbus_assert(strlen(src) +1 <= size);
   strcpy(dest,src);  
Index: tools/dbus-launch-win.c
===================================================================
--- tools/dbus-launch-win.c	(revision 627)
+++ tools/dbus-launch-win.c	(working copy)
@@ -25,19 +25,19 @@
 #include <string.h>
 #include <assert.h>
 
-#ifdef __MINGW32__
+#if defined __MINGW32__ || (defined _MSC_VER && _MSC_VER <= 1310)
 /* save string functions version
 */ 
 #define errno_t int
 
-errno_t strcat_s(char *dest, int size, char *src) 
+errno_t strcat_s(char *dest, size_t size, char *src) 
 {
   assert(strlen(dest) + strlen(src) +1 <= size);
   strcat(dest,src);
   return 0;
 }
 
-errno_t strcpy_s(char *dest, int size, char *src)
+errno_t strcpy_s(char *dest, size_t size, char *src)
 {
   assert(strlen(src) +1 <= size);
   strcpy(dest,src);  
