libmicrohttpd

commit 378e7495db5a7219cc5e9d518f45fe2c41b15b46
parent 93486b2cc197adaebd9d6147ff8d035d375c3ead
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Tue, 15 Dec 2015 15:35:55 +0000

Be more compatible with older compilers

Diffstat:
M
src/microhttpd/daemon.c
 | 
4
+++-
M
src/platform/w32functions.c
 | 
3
++-

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -4950,11 +4950,13 @@ static struct gcry_thread_cbs gcry_threads_w32 = {
 void
 MHD_init(void)
 {
+#ifdef _WIN32
+  WSADATA wsd;
+#endif /* _WIN32 */
   mhd_panic = &mhd_panic_std;
   mhd_panic_cls = NULL;
 
 #ifdef _WIN32
-  WSADATA wsd;
   if (0 != WSAStartup(MAKEWORD(2, 2), &wsd))
     MHD_PANIC ("Failed to initialize winsock\n");
   mhd_winsock_inited_ = 1;
diff --git a/src/platform/w32functions.c b/src/platform/w32functions.c
@@ -590,8 +590,9 @@ int MHD_W32_pair_of_sockets_(SOCKET sockets_pair[2])
                       || WSAGetLastError() == WSAEWOULDBLOCK))
                 {
                   struct sockaddr_in accepted_from_addr;
+                  SOCKET server_s;
                   addr_len = c_addinlen;
-                  SOCKET server_s = accept(listen_s,
+                  server_s = accept(listen_s,
                       (struct sockaddr*) &accepted_from_addr, &addr_len);
                   if (INVALID_SOCKET != server_s)
                     {