From: Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
Date: Thu, 3 Feb 2011 11:38:28 +0000 (+0100)
Subject: Fix socket implementation on Windows.
X-Git-Tag: gpgme-1.3.1~17^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bdbe888228ce09f15be4773800ed13263a8e43e;p=gpgme.git

Fix socket implementation on Windows.

2011-02-03  Marcus Brinkmann  <marcus@g10code.com>

        * w32-io.c (_gpgme_io_socket): Return fd, not res.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 73a62fe..4afcdf9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-03  Marcus Brinkmann  <marcus@g10code.com>
+
+	* w32-io.c (_gpgme_io_socket): Return fd, not res.
+
 2011-02-02  Marcus Brinkmann  <mb@g10code.com>
 
 	* assuan-support.c (my_socket, my_connect): New functions.
diff --git a/src/w32-io.c b/src/w32-io.c
index 10e0dad..56a05c4 100644
--- a/src/w32-io.c
+++ b/src/w32-io.c
@@ -2035,7 +2035,7 @@ _gpgme_io_socket (int domain, int type, int proto)
 
   TRACE_SUC2 ("socket=0x%x (0x%x)", fd, fd_table[fd].socket);
   
-  return res;
+  return fd;
 }