[GNUnet-SVN] r36764 - in libmicrohttpd/src: microhttpd platform

[gnunet]

Author: Karlson2k
Date: 2015-12-15 16:35:55 +0100 (Tue, 15 Dec 2015)
New Revision: 36764

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
   libmicrohttpd/src/platform/w32functions.c
Log:
Be more compatible with older compilers

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-12-15 14:01:51 UTC (rev 
36763)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-12-15 15:35:55 UTC (rev 
36764)
@@ -4950,11 +4950,13 @@
 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;

Modified: libmicrohttpd/src/platform/w32functions.c
===================================================================
--- libmicrohttpd/src/platform/w32functions.c   2015-12-15 14:01:51 UTC (rev 
36763)
+++ libmicrohttpd/src/platform/w32functions.c   2015-12-15 15:35:55 UTC (rev 
36764)
@@ -590,8 +590,9 @@
                       || 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)
                     {