From: Daniel Stenberg Date: Thu, 8 May 2025 09:35:37 +0000 (+0200) Subject: curlx: move version_win32.[ch] to curlx/ X-Git-Tag: curl-8_14_0~126 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16db059a93240dd7917728c2db55935f60a150ea;p=thirdparty%2Fcurl.git curlx: move version_win32.[ch] to curlx/ For curlx_verify_windows_version Closes #17290 --- diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 2974e9c3d5..921caf9ccc 100644 --- a/lib/Makefile.inc +++ b/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 diff --git a/lib/cf-socket.c b/lib/cf-socket.c index 67f182f3b9..c625d7fda6 100644 --- a/lib/cf-socket.c +++ b/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 */ diff --git a/lib/connect.c b/lib/connect.c index deb3cdf0db..fcac5ac7f1 100644 --- a/lib/connect.c +++ b/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" diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index db74574592..6516db56b9 100644 --- a/lib/curl_sspi.c +++ b/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: */ diff --git a/lib/curlx/curlx.h b/lib/curlx/curlx.h index c7b356aa98..1472f5d083 100644 --- a/lib/curlx/curlx.h +++ b/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 */ diff --git a/lib/curlx/timeval.c b/lib/curlx/timeval.c index 238a2bf4bd..8ef4c09bfc 100644 --- a/lib/curlx/timeval.c +++ b/lib/curlx/timeval.c @@ -27,7 +27,7 @@ #ifdef _WIN32 #include -#include "../version_win32.h" +#include "../curlx/version_win32.h" #include "../system_win32.h" LARGE_INTEGER Curl_freq; diff --git a/lib/version_win32.c b/lib/curlx/version_win32.c similarity index 98% rename from lib/version_win32.c rename to lib/curlx/version_win32.c index 4baba27086..8d0af68fcf 100644 --- a/lib/version_win32.c +++ b/lib/curlx/version_win32.c @@ -22,17 +22,17 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "../curl_setup.h" #ifdef _WIN32 #include #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) */ diff --git a/lib/version_win32.h b/lib/curlx/version_win32.h similarity index 98% rename from lib/version_win32.h rename to lib/curlx/version_win32.h index a91631eb23..471100a66f 100644 --- a/lib/version_win32.h +++ b/lib/curlx/version_win32.h @@ -24,7 +24,7 @@ * ***************************************************************************/ -#include "curl_setup.h" +#include "../curl_setup.h" #ifdef _WIN32 diff --git a/lib/system_win32.c b/lib/system_win32.c index 254e15d4da..b1fd12bea0 100644 --- a/lib/system_win32.c +++ b/lib/system_win32.c @@ -28,7 +28,7 @@ #include #include "system_win32.h" -#include "version_win32.h" +#include "curlx/version_win32.h" #include "curl_sspi.h" #include "curlx/warnless.h" diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 4a1f044999..d77bb2da9a 100644 --- a/lib/vtls/schannel.c +++ b/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" diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c index abbf31b8fb..01d5fb5fea 100644 --- a/lib/vtls/schannel_verify.c +++ b/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" diff --git a/projects/Windows/VC10/src/curl.tmpl b/projects/Windows/VC10/src/curl.tmpl index 9c419577f5..68ab7da5e1 100644 --- a/projects/Windows/VC10/src/curl.tmpl +++ b/projects/Windows/VC10/src/curl.tmpl @@ -2248,7 +2248,6 @@ CURL_LIB_CURLX_C_FILES -CURL_SRC_X_C_FILES CURL_SRC_C_FILES diff --git a/projects/Windows/VC11/src/curl.tmpl b/projects/Windows/VC11/src/curl.tmpl index 4c495d683a..11d50df3d5 100644 --- a/projects/Windows/VC11/src/curl.tmpl +++ b/projects/Windows/VC11/src/curl.tmpl @@ -2296,7 +2296,6 @@ CURL_LIB_CURLX_C_FILES -CURL_SRC_X_C_FILES CURL_SRC_C_FILES diff --git a/projects/Windows/VC12/src/curl.tmpl b/projects/Windows/VC12/src/curl.tmpl index c58479cee5..55a440c1ce 100644 --- a/projects/Windows/VC12/src/curl.tmpl +++ b/projects/Windows/VC12/src/curl.tmpl @@ -2296,7 +2296,6 @@ CURL_LIB_CURLX_C_FILES -CURL_SRC_X_C_FILES CURL_SRC_C_FILES diff --git a/projects/generate.bat b/projects/generate.bat index 0f2bb2432b..9e860c15f6 100644 --- a/projects/generate.bat +++ b/projects/generate.bat @@ -152,12 +152,9 @@ rem for /f "delims=" %%h in ('dir /b ..\src\*.h') do call :element %1 src "%%h" %3 ) else if "!var!" == "CURL_SRC_RC_FILES" ( for /f "delims=" %%r in ('dir /b ..\src\*.rc') do call :element %1 src "%%r" %3 - ) else if "!var!" == "CURL_SRC_X_C_FILES" ( - call :element %1 lib "version_win32.c" %3 ) else if "!var!" == "CURL_SRC_X_H_FILES" ( call :element %1 lib "config-win32.h" %3 call :element %1 lib "curl_setup.h" %3 - call :element %1 lib "version_win32.h" %3 ) else if "!var!" == "CURL_LIB_C_FILES" ( for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib "%%c" %3 ) else if "!var!" == "CURL_LIB_H_FILES" ( diff --git a/src/Makefile.inc b/src/Makefile.inc index a08968893b..c51aad1003 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -39,7 +39,7 @@ CURLX_CFILES = \ ../lib/curlx/strparse.c \ ../lib/curlx/timediff.c \ ../lib/curlx/timeval.c \ - ../lib/version_win32.c \ + ../lib/curlx/version_win32.c \ ../lib/curlx/warnless.c CURLX_HFILES = \ @@ -50,7 +50,7 @@ CURLX_HFILES = \ ../lib/curlx/strparse.h \ ../lib/curlx/timediff.h \ ../lib/curlx/timeval.h \ - ../lib/version_win32.h \ + ../lib/curlx/version_win32.h \ ../lib/curlx/warnless.h CURL_CFILES = \ diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc index 0f49f06d9c..e4f7d4311c 100644 --- a/tests/server/Makefile.inc +++ b/tests/server/Makefile.inc @@ -40,7 +40,7 @@ CURLX_SRCS = \ ../../lib/strcase.c \ ../../lib/strdup.c \ ../../lib/curlx/multibyte.c \ - ../../lib/version_win32.c + ../../lib/curlx/version_win32.c CURLX_HDRS = \ ../../lib/curlx/curlx.h \ @@ -54,7 +54,7 @@ CURLX_HDRS = \ ../../lib/strcase.h \ ../../lib/strdup.h \ ../../lib/curlx/multibyte.h \ - ../../lib/version_win32.h + ../../lib/curlx/version_win32.h UTIL = \ getpart.c \ diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 33bc4dbec8..6caf8cea5c 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -727,8 +727,8 @@ $(CURL_DIROBJ)\timeval.obj: ../lib/curlx/timeval.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/timeval.c $(CURL_DIROBJ)\multibyte.obj: ../lib/curlx/multibyte.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/multibyte.c -$(CURL_DIROBJ)\version_win32.obj: ../lib/version_win32.c - $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/version_win32.c +$(CURL_DIROBJ)\version_win32.obj: ../lib/curlx/version_win32.c + $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/version_win32.c $(CURL_DIROBJ)\warnless.obj: ../lib/curlx/warnless.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/warnless.c $(CURL_DIROBJ)\dynbuf.obj: ../lib/curlx/dynbuf.c