3 files changed, 12 insertions, 7 deletions
diff --git a/librabbitmq/amqp_openssl.c b/librabbitmq/amqp_openssl.c
index 15fa6bd..301a10d 100644
--- a/librabbitmq/amqp_openssl.c
+++ b/librabbitmq/amqp_openssl.c
@@ -421,12 +421,13 @@ int
 amqp_ssl_socket_set_cert(amqp_socket_t *base,
                          const char *cert)
 {
+  int status;
   struct amqp_ssl_socket_t *self;
   if (base->klass != &amqp_ssl_socket_class) {
     amqp_abort("<%p> is not of type amqp_ssl_socket_t", base);
   }
   self = (struct amqp_ssl_socket_t *)base;
-  int status = SSL_CTX_use_certificate_chain_file(self->ctx, cert);
+  status = SSL_CTX_use_certificate_chain_file(self->ctx, cert);
   if (1 != status) {
     return -1;
   }
diff --git a/librabbitmq/win32/socket.c b/librabbitmq/win32/socket.c
index 86dc4e1..82051fe 100644
--- a/librabbitmq/win32/socket.c
+++ b/librabbitmq/win32/socket.c
@@ -56,7 +56,7 @@ amqp_socket_init(void)
     WSADATA data;
     int res = WSAStartup(0x0202, &data);
     if (res) {
-      return (ERROR_CATEGORY_OS | res)
+      return (ERROR_CATEGORY_OS | res);
     }
 
     called_wsastartup = 1;
diff --git a/librabbitmq/win32/socket.h b/librabbitmq/win32/socket.h
index 58e1a99..cddbee5 100644
--- a/librabbitmq/win32/socket.h
+++ b/librabbitmq/win32/socket.h
@@ -52,18 +52,22 @@ amqp_socket_init(void);
 
 #define amqp_socket_socket socket
 
+char *
+amqp_os_error_string(int err);
+
 int
-amqp_socket_close(int sockfd, AMQP_UNUSED void *user_data);
+amqp_socket_setsockopt(int sock, int level, int optname,
+                       const void *optval, size_t optlen);
 
 int
-amqp_socket_setsockopt(int sock, int level, int optname, const void *optval,
-                       size_t optlen);
+amqp_os_socket_close(int sockfd);
+
 
 ssize_t
-amqp_socket_writev(int sock, struct iovec *iov, int nvecs, AMQP_UNUSED void *user_data);
+amqp_os_socket_writev(int sock, struct iovec *iov, int nvecs);
 
 int
-amqp_socket_error(AMQP_UNUSED void *user_data);
+amqp_os_socket_error(void);
 
 #ifndef MSG_NOSIGNAL
 # define MSG_NOSIGNAL 0x0