From: Werner Koch <wk@gnupg.org>
Date: Wed, 7 Oct 2009 11:17:57 +0000 (+0000)
Subject: Fix last change for Windows.
X-Git-Tag: gpgme-1.3.0~52
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa747b1575672bf10ae9f164f41ae10c0cba9519;p=gpgme.git

Fix last change for Windows.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index df973ef..a0b0581 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-07    <wk@g10code.com>
+
+	* priv-io.h [W32]: Include windows.h instead of sys/socket.h.
+
 2009-08-06  Werner Koch  <wk@g10code.com>
 
 	* op-support.c (_gpgme_parse_inv_recp): Allow for no fingerprint.
diff --git a/src/priv-io.h b/src/priv-io.h
index 3f2f96a..8d21695 100644
--- a/src/priv-io.h
+++ b/src/priv-io.h
@@ -22,7 +22,11 @@
 #ifndef IO_H
 #define IO_H
 
-#include <sys/socket.h>
+#ifdef HAVE_W32_SYSTEM
+# include <windows.h>
+#else
+# include <sys/socket.h>
+#endif
 
 /* A single file descriptor passed to spawn.  For child fds, dup_to
    specifies the fd it should become in the child, but only 0, 1 and 2