Merge branch 'dbus-1.6'

This commit is contained in:
Simon McVittie 2013-09-16 13:59:30 +01:00
commit 33d8b3b150

View file

@ -741,7 +741,7 @@ _dbus_write_two (int fd,
}
#else /* HAVE_WRITEV */
{
int ret1;
int ret1, ret2;
ret1 = _dbus_write (fd, buffer1, start1, len1);
if (ret1 == len1 && buffer2 != NULL)