summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2007-05-14 15:34:46 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2007-05-14 15:34:46 +0000
commitd090a330964a406f7e8abe1e9102650e1d92747d (patch)
tree8670d1f04e0e726f7fcd3e7d7d35956ac85ab917
parent90e35e17e5b0f50f7f4a4dd6452fbf66fc93ed47 (diff)
* dbus/dbus-sysdeps-win.c (_dbus_printf_string_upper_bound): compile fix for MS Platform SDK 6 patch from Michael Luschas <mluschas@gmail.com>
-rw-r--r--ChangeLog6
-rw-r--r--dbus/dbus-sysdeps-win.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8eb01761..86dbafc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-14 Ralf Habacker <ralf.habacker@freenet.de>
+
+ * dbus/dbus-sysdeps-win.c (_dbus_printf_string_upper_bound):
+ compile fix for MS Platform SDK 6
+ patch from Michael Luschas <mluschas@gmail.com>
+
2007-05-10 John (J5) Palmieri <johnp@redhat.com>
* dbus-1.pc.in: add daemondir to pc file
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 08ac6a0f..3f56323c 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -1609,12 +1609,12 @@ int _dbus_printf_string_upper_bound (const char *format,
*/
char p[1024];
int len;
- len = vsnprintf (p, sizeof(p)-1, format, args);
+ len = _vsnprintf (p, sizeof(p)-1, format, args);
if (len == -1) // try again
{
char *p;
p = malloc (strlen(format)*3);
- len = vsnprintf (p, sizeof(p)-1, format, args);
+ len = _vsnprintf (p, sizeof(p)-1, format, args);
free(p);
}
return len;