diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-util-win.c | 6 | ||||
| -rw-r--r-- | tools/dbus-launch-win.c | 6 |
3 files changed, 12 insertions, 7 deletions
@@ -1,8 +1,13 @@ 2007-06-19 Ralf Habacker <ralf.habacker@freenet.de> + * dbus/dbus-sysdeps-util-win.c, tools/dbus-launch-win.c: + msvc7.1 fixes by Jaroslaw Staniek tested with mingw + +2007-06-19 Ralf Habacker <ralf.habacker@freenet.de> + * dbus/dbus-sysdeps-win.c, dbus/dbus-sysdeps-spawn-win.c, dbus/dbus-sysdeps-win.h: disabled DBusSocket implementation - Patch by Peter Kuemmel + by Peter Kuemmel 2007-06-18 Ralf Habacker <ralf.habacker@freenet.de> diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c index 8bef5af9..fa622010 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -52,20 +52,20 @@ typedef struct { #include <fcntl.h> #include <errno.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); diff --git a/tools/dbus-launch-win.c b/tools/dbus-launch-win.c index 972ad278..17f2310a 100644 --- a/tools/dbus-launch-win.c +++ b/tools/dbus-launch-win.c @@ -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); |