From e5801287da1b83f9dbc68bae4e8a54394f23c8ec Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cynapses.org>
Date: Wed, 18 Aug 2010 22:06:59 +0200
Subject: poll: Fixed the ssh_poll_(init/cleanup) functions.

---
 libssh/poll.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libssh')

diff --git a/libssh/poll.c b/libssh/poll.c
index ab18be72..537eb955 100644
--- a/libssh/poll.c
+++ b/libssh/poll.c
@@ -241,6 +241,8 @@ static int bsd_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
 }
 
 void ssh_poll_init(void) {
+    ssh_poll_emu = bsd_poll;
+
 #ifdef _WIN32
     hlib = LoadLibrary(WS2_LIBRARY);
     if (hlib != NULL) {
@@ -248,20 +250,20 @@ void ssh_poll_init(void) {
     }
 #endif /* _WIN32 */
 
-    if (wsa_poll == NULL) {
+    if (wsa_poll != NULL) {
         ssh_poll_emu = bsd_poll;
-    } else {
-        ssh_poll_emu = win_poll;
     }
 }
 
 void ssh_poll_cleanup(void) {
     ssh_poll_emu = bsd_poll;
+#ifdef _WIN32
     wsa_poll = NULL;
 
     FreeLibrary(hlib);
 
     hlib = NULL;
+#endif /* _WIN32 */
 }
 
 int ssh_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
-- 
cgit