aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/priv-io.h6
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index df973ef5..a0b0581d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-07 <[email protected]>
+
+ * priv-io.h [W32]: Include windows.h instead of sys/socket.h.
+
2009-08-06 Werner Koch <[email protected]>
* op-support.c (_gpgme_parse_inv_recp): Allow for no fingerprint.
diff --git a/src/priv-io.h b/src/priv-io.h
index 3f2f96ac..8d216955 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