Quellcode durchsuchen

Be more compatible with older compilers

Evgeny Grin (Karlson2k) vor 10 Jahren
Ursprung
Commit
378e7495db
2 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen
  1. 3 1
      src/microhttpd/daemon.c
  2. 2 1
      src/platform/w32functions.c

+ 3 - 1
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;

+ 2 - 1
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)
                     {