diff options
| author | Marcus Brinkmann <[email protected]> | 2011-02-03 11:38:28 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2011-02-03 11:38:28 +0000 |
| commit | 2bdbe888228ce09f15be4773800ed13263a8e43e (patch) | |
| tree | 833fa5addaf235780428c65f505f3e325ec427c0 /src | |
| parent | Fix Windows port (spawn and assuan engine). (diff) | |
| download | gpgme-2bdbe888228ce09f15be4773800ed13263a8e43e.tar.gz gpgme-2bdbe888228ce09f15be4773800ed13263a8e43e.zip | |
Fix socket implementation on Windows.
2011-02-03 Marcus Brinkmann <[email protected]>
* w32-io.c (_gpgme_io_socket): Return fd, not res.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32-io.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 73a62fe3..4afcdf98 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-02-03 Marcus Brinkmann <[email protected]> + + * w32-io.c (_gpgme_io_socket): Return fd, not res. + 2011-02-02 Marcus Brinkmann <[email protected]> * assuan-support.c (my_socket, my_connect): New functions. diff --git a/src/w32-io.c b/src/w32-io.c index 10e0dade..56a05c4b 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; } |