From a2a409f7a5908177a6a68825d9081296e94afba6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 30 Dec 2020 14:29:06 +0100
Subject: [PATCH] Remove references to non-existent wxWebRequest headers

Remove the platform-specific wxWebRequest headers from the files lists
and from MSVS 200x project files.

This should have been done in e5bd5a926c (Move backend-specific
wxWebRequest headers to private subdirs, 2020-12-26) manually, as
update-setup-h script doesn't remove the old files from the variable
definitions.

It notably fixes CMake build under MSW and Mac, which failed due to not
finding the referenced files.
---
 build/bakefiles/files.bkl    | 6 ------
 build/bakefiles/multilib.bkl | 4 ++--
 build/cmake/files.cmake      | 8 --------
 build/msw/wx_vc7_net.vcproj  | 3 ---
 build/msw/wx_vc8_net.vcproj  | 4 ----
 build/msw/wx_vc9_net.vcproj  | 4 ----
 6 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 9e13a46f20..00adccfbb5 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -757,9 +757,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/urlmsw.cpp
     src/msw/webrequest_winhttp.cpp
 </set>
-<set var="NET_WIN32_HDR" hints="files">
-    wx/msw/webrequest_winhttp.h
-</set>
 
 
 <set var="NET_CMN_SRC" hints="files">
@@ -3523,9 +3520,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC) $(NET_OSX_SRC)</if>
     </set>
-    <set var="NET_PLATFORM_HDR" hints="files">
-        <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR)</if>
-    </set>
 
     <set var="NET_SRC" hints="files">
         $(NET_CMN_SRC) $(NET_PLATFORM_SRC)
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index c378688dd7..2dbd123173 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -49,14 +49,14 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_NET</define>
         <sources>$(NET_SRC)</sources>
-        <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
+        <msvc-headers>$(NET_CMN_HDR)</msvc-headers>
         <library>basedll</library>
     </dll>
 
     <lib id="netlib" template="wx_base_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
         <sources>$(NET_SRC)</sources>
-        <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
+        <msvc-headers>$(NET_CMN_HDR)</msvc-headers>
     </lib>
 
     <wxshortcut id="wxnet" cond="MONOLITHIC=='0'"/>
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index b9c3e24629..99d1e65f99 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -663,20 +663,12 @@ set(NET_OSX_SRC
     src/osx/webrequest_urlsession.mm
 )
 
-set(NET_OSX_HDR
-    wx/osx/webrequest_urlsession.h
-)
-
 set(NET_WIN32_SRC
     src/msw/sockmsw.cpp
     src/msw/urlmsw.cpp
     src/msw/webrequest_winhttp.cpp
 )
 
-set(NET_WIN32_HDR
-    wx/msw/webrequest_winhttp.h
-)
-
 set(NET_CMN_SRC
     src/common/fs_inet.cpp
     src/common/ftp.cpp
diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj
index 4ba46bc2f9..ec9768344c 100644
--- a/build/msw/wx_vc7_net.vcproj
+++ b/build/msw/wx_vc7_net.vcproj
@@ -454,9 +454,6 @@
 						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\webrequest_winhttp.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj
index f6590e3b87..57ed16fddd 100644
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -1108,10 +1108,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\webrequest_winhttp.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj
index 65e461df65..b4385ee1d9 100644
--- a/build/msw/wx_vc9_net.vcproj
+++ b/build/msw/wx_vc9_net.vcproj
@@ -1104,10 +1104,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\webrequest_winhttp.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"