romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-15 00:41:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

curlx: move version_win32.[ch] to curlx/

Browse source 
For curlx_verify_windows_version

Closes #17290
This commit is contained in:
Daniel Stenberg 2025-05-08 11:35:37 +02:00
parent 5b454bae0c
commit 16db059a93
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
18 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Makefile.inc
View file

@ -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

2
lib/cf-socket.c
View file

@ -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 */

2
lib/connect.c
View file

@ -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"

2
lib/curl_sspi.c
View file

@ -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: */

4
lib/curlx/curlx.h
View file

@ -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 */

2
lib/curlx/timeval.c
View file

@ -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;

8
lib/version_win32.c → lib/curlx/version_win32.c
View file

@ -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) */

2
lib/version_win32.h → lib/curlx/version_win32.h
View file

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

2
lib/system_win32.c
View file

@ -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"

2
lib/vtls/schannel.c
View file

@ -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"

2
lib/vtls/schannel_verify.c
View file

@ -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"

1
projects/Windows/VC10/src/curl.tmpl
View file

@ -2248,7 +2248,6 @@
</ItemDefinitionGroup>
<ItemGroup>
CURL_LIB_CURLX_C_FILES
CURL_SRC_X_C_FILES
CURL_SRC_C_FILES
</ItemGroup>
<ItemGroup>

1
projects/Windows/VC11/src/curl.tmpl
View file

@ -2296,7 +2296,6 @@
</ItemDefinitionGroup>
<ItemGroup>
CURL_LIB_CURLX_C_FILES
CURL_SRC_X_C_FILES
CURL_SRC_C_FILES
</ItemGroup>
<ItemGroup>

1
projects/Windows/VC12/src/curl.tmpl
View file

@ -2296,7 +2296,6 @@
</ItemDefinitionGroup>
<ItemGroup>
CURL_LIB_CURLX_C_FILES
CURL_SRC_X_C_FILES
CURL_SRC_C_FILES
</ItemGroup>
<ItemGroup>

3
projects/generate.bat
View file

@ -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" (

4
src/Makefile.inc
View file

@ -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 = \

4
tests/server/Makefile.inc
View file

@ -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 \

4
winbuild/MakefileBuild.vc
View file

@ -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