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 2974e9c3d57d25984ae2f2fd3fcc2566abcac04a..921caf9ccc145111a0fef87108531f710506d24b 100644 (file)
--- 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 67f182f3b9fdc46d2f1b7e0ecff071d2471d027c..c625d7fda61a97a9ab15fff234be453321d9f0be 100644 (file)
--- 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 deb3cdf0dbdcda44979b049d1029e2be03a507e3..fcac5ac7f109a10fa061b87b675ddd073abb71da 100644 (file)
--- 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 db7457459229595423aef1ac8ce9ca3aa5319432..6516db56b965a978a1b3d16b382977c0340b4806 100644 (file)
--- 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 c7b356aa9882e0a5dfa9796da153e1b83c4f9a96..1472f5d083a77003a29d4353a6715963fb6bfe7e 100644 (file)
--- 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 238a2bf4bde1a6c1b3a1fcdc26f4b16d250a0c91..8ef4c09bfce9954e73d604737f58018058f3d6a5 100644 (file)
--- a/lib/curlx/timeval.c
+++ b/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;

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 4baba2708680e1b67d8a5356159798dd5058ff13..8d0af68fcfe0405baed84444b660b33bf4ca5928 100644 (file)
--- 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 <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) */

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 a91631eb23bfbf58b35161b4b299a7c0dfafb321..471100a66f51c0cc91e1939a99e0894b78a2eb64 100644 (file)
--- 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 254e15d4daad65a5861d5214cd810cb622bafa02..b1fd12bea0d8de0d7eb7470314a3af0e9047861a 100644 (file)
--- a/lib/system_win32.c
+++ b/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"
 

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 4a1f04499953ee81cc406f6016b62157e7bb3b77..d77bb2da9a797a624b5420d6f64eb0e159012ccc 100644 (file)
--- 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 abbf31b8fb01a1e5c780746e501e40904f008955..01d5fb5fea9fd6db04c165d55e78e6aef9bd2694 100644 (file)
--- 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 9c419577f5fbb6607be4f42abce5412a12baa33c..68ab7da5e1019f7424bcd296890a4ad7fad66da8 100644 (file)
--- a/projects/Windows/VC10/src/curl.tmpl
+++ b/projects/Windows/VC10/src/curl.tmpl
@@ -2248,7 +2248,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
 CURL_LIB_CURLX_C_FILES
-CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>

diff --git a/projects/Windows/VC11/src/curl.tmpl b/projects/Windows/VC11/src/curl.tmpl
index 4c495d683aaf094e69004a15ecbdaf58c3275ff4..11d50df3d5a3a2806f771593b50fb4b3a8b9810c 100644 (file)
--- a/projects/Windows/VC11/src/curl.tmpl
+++ b/projects/Windows/VC11/src/curl.tmpl
@@ -2296,7 +2296,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
 CURL_LIB_CURLX_C_FILES
-CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>

diff --git a/projects/Windows/VC12/src/curl.tmpl b/projects/Windows/VC12/src/curl.tmpl
index c58479cee53646a5b587883ed7b56bbaec7dc579..55a440c1ce880318641f678949bc0cfeb51505bb 100644 (file)
--- a/projects/Windows/VC12/src/curl.tmpl
+++ b/projects/Windows/VC12/src/curl.tmpl
@@ -2296,7 +2296,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
 CURL_LIB_CURLX_C_FILES
-CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>

diff --git a/projects/generate.bat b/projects/generate.bat
index 0f2bb2432b54961b669cfef303ccccf2b430cf28..9e860c15f619111ee52a6392cda950a1655272cf 100644 (file)
--- 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 a08968893bc9b981c44dd99e4cfd1ed49098ba05..c51aad100374c2197e47778f6ee0ccd34f1de168 100644 (file)
--- 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 0f49f06d9c0f687d2fc902bda8fca788479df54b..e4f7d4311ca3d83ae813f22f00e9c92b6f112908 100644 (file)
--- 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 33bc4dbec8a9b8269418252597a9c20f384f8a24..6caf8cea5c666492261a9ab0f54908c2bbead593 100644 (file)
--- 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