Merge pull request #3823 from neheb/mm

fix stdcall warnings under clang32/64

include/backend.h

@@ -93,7 +93,9 @@ int run_kernel_decompress                   (hashcat_ctx_t *hashcat_ctx, hc_devi
 int run_copy                                (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const u64 pws_cnt);
 int run_cracker                             (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, const u64 pws_pos, const u64 pws_cnt);
 
+HC_API_CALL
 void *hook12_thread (void *p);
+HC_API_CALL
 void *hook23_thread (void *p);
 
 #endif // HC_BACKEND_H

include/brain.h

@@ -240,7 +240,9 @@ int   brain_server_sort_hash_long       (const void *v1, const void *v2);
 int   brain_server_sort_hash_short      (const void *v1, const void *v2);
 int   brain_server_sort_hash_unique     (const void *v1, const void *v2);
 void  brain_server_handle_signal        (int signo);
+HC_API_CALL
 void *brain_server_handle_client        (void *p);
+HC_API_CALL
 void *brain_server_handle_dumps         (void *p);
 void  brain_server_db_hash_init         (brain_server_db_hash_t *brain_server_db_hash, const u32 brain_session);
 bool  brain_server_db_hash_realloc      (brain_server_db_hash_t *brain_server_db_hash, const i64 new_long_cnt);

include/dispatch.h

@@ -8,7 +8,7 @@
 
 #ifdef WITH_BRAIN
 #if defined (_WIN)
-#include <winsock.h>
+#include <winsock2.h>
 #define SEND_FLAGS 0
 #endif
 

src/shared.c

@@ -19,6 +19,10 @@
 #include <sys/sysctl.h>
 #endif
 
+#if defined (_WIN)
+#include <winsock2.h>
+#endif
+
 static const char *const PA_000 = "OK";
 static const char *const PA_001 = "Ignored due to comment";
 static const char *const PA_002 = "Ignored due to zero length";
@@ -908,7 +912,11 @@ int select_read_timeout (int sockfd, const int sec)
   fd_set fds;
 
   FD_ZERO (&fds);
+#if defined(_WIN)
+  FD_SET ((SOCKET)sockfd, &fds);
+#else
   FD_SET (sockfd, &fds);
+#endif
 
   return select (sockfd + 1, &fds, NULL, NULL, &tv);
 }
@@ -923,7 +931,11 @@ int select_write_timeout (int sockfd, const int sec)
   fd_set fds;
 
   FD_ZERO (&fds);
+#if defined(_WIN)
+  FD_SET ((SOCKET)sockfd, &fds);
+#else
   FD_SET (sockfd, &fds);
+#endif
 
   return select (sockfd + 1, NULL, &fds, NULL, &tv);
 }