[svn] gpgme - r1396 - trunk/src

[svn author wk]

Author: wk
Date: 2009-10-07 13:17:57 +0200 (Wed, 07 Oct 2009)
New Revision: 1396

Modified:
   trunk/src/ChangeLog
   trunk/src/priv-io.h
Log:
Fix last change for Windows.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-08-06 19:09:10 UTC (rev 1395)
+++ trunk/src/ChangeLog	2009-10-07 11:17:57 UTC (rev 1396)
@@ -1,3 +1,7 @@
+2009-10-07    <wk at g10code.com>
+
+	* priv-io.h [W32]: Include windows.h instead of sys/socket.h.
+
 2009-08-06  Werner Koch  <wk at g10code.com>
 
 	* op-support.c (_gpgme_parse_inv_recp): Allow for no fingerprint.

Modified: trunk/src/priv-io.h
===================================================================
--- trunk/src/priv-io.h	2009-08-06 19:09:10 UTC (rev 1395)
+++ trunk/src/priv-io.h	2009-10-07 11:17:57 UTC (rev 1396)
@@ -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