curlx: move version_win32.[ch] to curlx/

For curlx_verify_windows_version

Closes #17290

lib/Makefile.inc

@@ -30,6 +30,7 @@ LIB_CURLX_CFILES = \
   curlx/strparse.c \
   curlx/timediff.c \
   curlx/timeval.c  \
+  curlx/version_win32.c \
   curlx/warnless.c
 
 LIB_CURLX_HFILES = \
@@ -41,6 +42,7 @@ LIB_CURLX_HFILES = \
   curlx/strparse.h \
   curlx/timediff.h \
   curlx/timeval.h  \
+  curlx/version_win32.h \
   curlx/warnless.h
 
 LIB_VAUTH_CFILES =      \
@@ -257,7 +259,6 @@ LIB_CFILES =         \
   url.c              \
   urlapi.c           \
   version.c          \
-  version_win32.c    \
   ws.c
 
 LIB_HFILES =         \
@@ -392,7 +393,6 @@ LIB_HFILES =         \
   url.h              \
   urlapi-int.h       \
   urldata.h          \
-  version_win32.h    \
   ws.h
 
 LIB_RCFILES = libcurl.rc

lib/cf-socket.c

@@ -83,7 +83,7 @@
 #include "share.h"
 #include "strdup.h"
 #include "system_win32.h"
-#include "version_win32.h"
+#include "curlx/version_win32.h"
 #include "curlx/strparse.h"
 
 /* The last 3 #include files should be in this order */

lib/connect.c

@@ -74,7 +74,7 @@
 #include "conncache.h"
 #include "multihandle.h"
 #include "share.h"
-#include "version_win32.h"
+#include "curlx/version_win32.h"
 #include "vquic/vquic.h" /* for quic cfilters */
 #include "http_proxy.h"
 #include "socks.h"

lib/curl_sspi.c

@@ -30,7 +30,7 @@
 #include "curl_sspi.h"
 #include "curlx/multibyte.h"
 #include "system_win32.h"
-#include "version_win32.h"
+#include "curlx/version_win32.h"
 #include "curlx/warnless.h"
 
 /* The last #include files should be: */

lib/curlx/curlx.h

@@ -52,8 +52,8 @@
   curlx_unicodefree()
 */
 
-#include "../version_win32.h"
-/* "version_win32.h" provides curlx_verify_windows_version() */
+#include "version_win32.h"
+/* provides curlx_verify_windows_version() */
 
 #include "strparse.h"
 /* The curlx_str_* parsing functions */

lib/curlx/timeval.c

@@ -27,7 +27,7 @@
 #ifdef _WIN32
 
 #include <curl/curl.h>
-#include "../version_win32.h"
+#include "../curlx/version_win32.h"
 #include "../system_win32.h"
 
 LARGE_INTEGER Curl_freq;

lib/curlx/version_win32.c

@@ -22,17 +22,17 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "../curl_setup.h"
 
 #ifdef _WIN32
 
 #include <curl/curl.h>
 #include "version_win32.h"
-#include "curlx/warnless.h"
+#include "warnless.h"
 
 /* The last 2 #include files should be in this order */
-#include "curl_memory.h"
-#include "memdebug.h"
+#include "../curl_memory.h"
+#include "../memdebug.h"
 
 /* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW)
    and RtlVerifyVersionInfo (RTLOSVERSIONINFOEXW) */

lib/curlx/version_win32.h

@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "../curl_setup.h"
 
 #ifdef _WIN32
 

lib/system_win32.c

@@ -28,7 +28,7 @@
 
 #include <curl/curl.h>
 #include "system_win32.h"
-#include "version_win32.h"
+#include "curlx/version_win32.h"
 #include "curl_sspi.h"
 #include "curlx/warnless.h"
 

lib/vtls/schannel.c

@@ -54,7 +54,7 @@
 #include "../curl_printf.h"
 #include "../multiif.h"
 #include "../system_win32.h"
-#include "../version_win32.h"
+#include "../curlx/version_win32.h"
 #include "../rand.h"
 #include "../curlx/strparse.h"
 

lib/vtls/schannel_verify.c

@@ -47,7 +47,7 @@
 #include "../curlx/multibyte.h"
 #include "../curl_printf.h"
 #include "hostcheck.h"
-#include "../version_win32.h"
+#include "../curlx/version_win32.h"
 
 /* The last #include file should be: */
 #include "../curl_memory.h"