Merge c2f7973 into 596cfb6

curl · Jul 4, 2017 · 9527534 · 9527534
2 parents 596cfb6 + c2f7973
commit 9527534
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/appveyor.yml b/appveyor.yml
@@ -62,6 +62,7 @@ build_script:
     - mkdir build.%BDIR%
     - cd build.%BDIR%
     - cmake .. -G"%PRJ_GEN%" -DCMAKE_USE_OPENSSL=%OPENSSL% -DCURL_STATICLIB=%STATICLIB% -DBUILD_TESTING=%TESTING%
+    - cat lib/curl_config.h
     - cmake --build . --config %PRJ_CFG% --clean-first
 
 # whitelist branches to avoid testing feature branches twice (as branch and as pull request)

diff --git a/lib/inet_pton.h b/lib/inet_pton.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -29,6 +29,9 @@ int Curl_inet_pton(int, const char *, void *);
 #ifdef HAVE_INET_PTON
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#elif defined(HAVE_WINSOCK2_H)
+/* inet_pton() exists in Windows XP or later */
+#include <winsock2.h>
 #endif
 #define Curl_inet_pton(x,y,z) inet_pton(x,y,z)
 #endif