summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-16 13:59:30 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-16 13:59:30 +0100
commit33d8b3b1508d2305b25ff06fcffd96ff925c500e (patch)
tree78e05c1edcd55837c563b6983a3d70113737de06
parent996b2968357f01d92d46c53ba59e9bd39ecd20eb (diff)
parent61889c8c11aa60928bf5bd317c4e1f2d97b77bf1 (diff)
downloaddbus-33d8b3b1508d2305b25ff06fcffd96ff925c500e.tar.gz
Merge branch 'dbus-1.6'
-rw-r--r--dbus/dbus-sysdeps-unix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 54c02721..09ab92ab 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -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)