From 4a524c4b61f52a1930afdd33348118fc72137bd9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 09:46:42 +0200 Subject: [PATCH 1/2] inet_pton: fix include on windows to get prototype inet_pton() exists on Windows and gets used by our cmake builds. Make sure the correct header file is included to avoid compiler warnings. --- lib/inet_pton.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/inet_pton.h b/lib/inet_pton.h index 9188d9598f3559..63de7cc429da38 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, , 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 +#elif defined(HAVE_WINSOCK2_H) +/* inet_pton() exists in Windows XP or later */ +#include #endif #define Curl_inet_pton(x,y,z) inet_pton(x,y,z) #endif From c2f7973e218ae0c8738e6f3b13a6913b4b93ab78 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 23:49:28 +0200 Subject: [PATCH 2/2] appveyor: [debug] dump lib/curl_config.h post cmake --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 8e55009da16606..b33958901cd733 100644 --- 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)