]> granicus.if.org Git - curl/commitdiff
system.h: fix mingw section
authorDaniel Stenberg <daniel@haxx.se>
Tue, 11 Apr 2017 11:45:56 +0000 (13:45 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Tue, 11 Apr 2017 13:54:42 +0000 (15:54 +0200)
Reported-by: Marcel Raad
Fixes #1408
Closes #1409

include/curl/system.h

index f4edc436d0413c154d93dd4cceb1a6e9dc810db6..ed3a55c954737970f9058d36e7bf36192136c569 100644 (file)
 #  define CURLSYS_SIZEOF_CURL_OFF_T     8
 #  define CURLSYS_SUFFIX_CURL_OFF_T     LL
 #  define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
+#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t
 #  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
+#  define CURLSYS_PULL_SYS_TYPES_H      1
+#  define CURLSYS_PULL_WS2TCPIP_H       1
 
 #elif defined(__VMS)
 #  if defined(__VAX)
 # define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
 #endif
 
+/* CURLSYS_PULL_WS2TCPIP_H is defined above when inclusion of header file  */
+/* ws2tcpip.h is required here to properly make type definitions below. */
+#ifdef CURLSYS_PULL_WS2TCPIP_H
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  include <winsock2.h>
+#  include <ws2tcpip.h>
+#endif
+
 /* CURLSYS_PULL_SYS_TYPES_H is defined above when inclusion of header file  */
 /* sys/types.h is required here to properly make type definitions below. */
 #ifdef CURLSYS_PULL_SYS_TYPES_H