diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2009-04-08 18:53:57 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2009-04-08 18:53:57 +0000 |
| commit | d255b4bec9a1fdf0864640750161ea12999e43a5 (patch) | |
| tree | 75e870ff7e07cb4f2bf30dc8a136c72eb4bf6bd4 /src/version.c | |
| parent | 6f8aa0e29d46f3109a5c3f8f9d7a7dc3e7b6abef (diff) | |
| download | gpgme-d255b4bec9a1fdf0864640750161ea12999e43a5.tar.gz | |
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
Diffstat (limited to 'src/version.c')
| -rw-r--r-- | src/version.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c index 03d9e9ae..c6fb52b9 100644 --- a/src/version.c +++ b/src/version.c @@ -40,6 +40,10 @@ #include "assuan.h" #endif +#ifdef HAVE_W32_SYSTEM +#include "windows.h" +#endif + /* Bootstrap the subsystems needed for concurrent operation. This must be done once at startup. We can not guarantee this using a @@ -54,6 +58,14 @@ do_subsystem_inits (void) if (done) return; +#ifdef HAVE_W32_SYSTEM + { + WSADATA wsadat; + + WSAStartup (0x202, &wsadat); + } +#endif + _gpgme_sema_subsystem_init (); #ifdef HAVE_ASSUAN_H assuan_set_assuan_err_source (GPG_ERR_SOURCE_GPGME); |