[git] GPGME - branch, master, updated. gpgme-1.1.8-165-g2bdbe88

[by Marcus Brinkmann]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  2bdbe888228ce09f15be4773800ed13263a8e43e (commit)
      from  129741d2f713305a862a1505f20738a0ce2ea656 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2bdbe888228ce09f15be4773800ed13263a8e43e
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Thu Feb 3 12:38:28 2011 +0100

    Fix socket implementation on Windows.
    
    2011-02-03  Marcus Brinkmann  <marcus at 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 at g10code.com>
+
+	* w32-io.c (_gpgme_io_socket): Return fd, not res.
+
 2011-02-02  Marcus Brinkmann  <mb at 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;
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/ChangeLog |    4 ++++
 src/w32-io.c  |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org