windows: fix builds targeting WinXP, test it in CI

- appveyor: make a job target Windows XP.

- examples/block_ip: force this specific example to target Vista to make
  it compile when building curl for Windows XP. Fixing:
  ```
  docs\examples\block_ip.c(157): warning C4013: 'inet_pton' undefined; assuming extern returning int
  docs\examples\block_ip.c(272): warning C4013: 'inet_ntop' undefined; assuming extern returning int
  ```
  Ref: https://ci.appveyor.com/project/curlorg/curl/builds/52102142/job/2ajdluhc20r4gmmw#L530

Cherry-picked from #17413
Closes #17415

diff --git a/appveyor.sh b/appveyor.sh
index b79838367c39b7c24b604a8984f34445d4269092..9deac61e0bc4018b01bbe799bcb3499e51874fe0 100644 (file)
--- a/appveyor.sh
+++ b/appveyor.sh
@@ -52,6 +52,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
     [ "${_chkprefill}" = '_chkprefill' ] && options+=' -D_CURL_PREFILL=OFF'
     [[ "${TARGET}" = *'ARM64'* ]] && SKIP_RUN='ARM64 architecture'
     [ -n "${TOOLSET:-}" ] && options+=" -T ${TOOLSET}"
+    [ -n "${WINTARGET:-}" ] && options+=" -DCURL_TARGET_WINDOWS_VERSION=${WINTARGET}"
     [ "${OPENSSL}" = 'ON' ] && options+=" -DOPENSSL_ROOT_DIR=${openssl_root_win}"
     [ -n "${CURLDEBUG:-}" ] && options+=" -DENABLE_CURLDEBUG=${CURLDEBUG}"
     if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = 'Visual Studio 2013' ]; then

diff --git a/appveyor.yml b/appveyor.yml
index ab8e993e1f1383483752777993aafe83c6c91b64..2627690e61d37707fd944ce2c98b02dd7366ec9b 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -74,6 +74,7 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
       PRJ_GEN: 'Visual Studio 10 2010'
       TARGET: '-A x64'
+      WINTARGET: 0x0501  # Windows XP
       PRJ_CFG: Debug
       SCHANNEL: 'ON'
       SHARED: 'ON'

diff --git a/docs/examples/block_ip.c b/docs/examples/block_ip.c
index 9a1c0222e88b0b3fbbefc31fdbb701492a1a4c0f..bff7b6353c3c7ae7f874e85eea269363fa858a9c 100644 (file)
--- a/docs/examples/block_ip.c
+++ b/docs/examples/block_ip.c
@@ -41,8 +41,9 @@ int main(void) { printf("Platform not supported.\n"); return 1; }
 #ifndef _CRT_NONSTDC_NO_DEPRECATE
 #define _CRT_NONSTDC_NO_DEPRECATE
 #endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600  /* Requires Windows Vista */
 #endif
 #include <winsock2.h>
 #include <ws2tcpip.h>