From 327b2eea26c07e5679fa7f875e223a021daab8ed Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 24 Oct 2008 08:55:13 +0000
Subject: [PATCH] fix mingw compilation warning

* src/libvirt.c (winsock_init) [HAVE_WINSOCK2_H]: Always return a value.
---
 ChangeLog     | 5 +++++
 src/libvirt.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0505ee4ee7..4e9a905de9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 10:54:23 CEST Jim Meyering <meyering@redhat.com>
+
+	fix mingw compilation warning
+	* src/libvirt.c (winsock_init) [HAVE_WINSOCK2_H]: Always return a value.
+
 Thu Oct 23 15:20:00 CEST 2008 Chris Lalancete <clalance@redhat.com>
 	* src/storage_conf.c: brown paper bag bug.  I didn't preserve the
 	<sources> tags properly, and I didn't put the <source> tag into the
diff --git a/src/libvirt.c b/src/libvirt.c
index 8fd594b0f7..00c0cb20f2 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -238,8 +238,7 @@ winsock_init (void)
     /* http://msdn2.microsoft.com/en-us/library/ms742213.aspx */
     winsock_version = MAKEWORD (2, 2);
     err = WSAStartup (winsock_version, &winsock_data);
-    if (err != 0)
-        return -1;
+    return err == 0 ? 0 : -1;
 }
 #endif