commit fff70a567ae0bfb9ea61e281d801ee229db5fbcf
author Corentin Wallez <cwallez@chromium.org> Mon Jun 03 19:17:30 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 03 19:17:30 2024 +0000
tree 225c3727590f8e43a6e22b2674df8e610ee42763
parent 99df2e6f2090d197b6eb481e6653df64ee6364d0

Use windows_with_undefs.h everywhere in Dawn.

Bug: None
Change-Id: Ieaf5814810ec1d93c5d6c342918aab4e7f3647ac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/191440
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn/common/Log.cpp

diff --git a/src/dawn/common/Log.cpp b/src/dawn/common/Log.cpp
index 791b6de..6df2647 100644
--- a/src/dawn/common/Log.cpp
+++ b/src/dawn/common/Log.cpp
@@ -37,7 +37,7 @@
 #include <android/log.h>
 #endif
 #if DAWN_PLATFORM_IS(WINDOWS)
-#include <windows.h>
+#include "dawn/common/windows_with_undefs.h"
 #endif
 
 namespace dawn {

src/dawn/native/SystemEvent.cpp

diff --git a/src/dawn/native/SystemEvent.cpp b/src/dawn/native/SystemEvent.cpp
index 747f2bd..f8dd1c8 100644
--- a/src/dawn/native/SystemEvent.cpp
+++ b/src/dawn/native/SystemEvent.cpp
@@ -30,7 +30,7 @@
 #include "dawn/common/Assert.h"
 
 #if DAWN_PLATFORM_IS(WINDOWS)
-#include <windows.h>
+#include "dawn/common/windows_with_undefs.h"
 #elif DAWN_PLATFORM_IS(FUCHSIA)
 #include <poll.h>
 #include <unistd.h>

src/dawn/native/d3d/D3DError.cpp

diff --git a/src/dawn/native/d3d/D3DError.cpp b/src/dawn/native/d3d/D3DError.cpp
index be84e00..7c55daf 100644
--- a/src/dawn/native/d3d/D3DError.cpp
+++ b/src/dawn/native/d3d/D3DError.cpp
@@ -27,12 +27,12 @@
 
 #include "dawn/native/d3d/D3DError.h"
 
-#include <windows.h>
-
 #include <iomanip>
 #include <sstream>
 #include <string>
 
+#include "dawn/common/windows_with_undefs.h"
+
 namespace dawn::native::d3d {
 const char* HRESULTAsString(HRESULT result) {
     // There's a lot of possible HRESULTS, but these ones are the ones specifically listed as

src/dawn/tests/end2end/BufferHostMappedPointerTests_win.cpp

diff --git a/src/dawn/tests/end2end/BufferHostMappedPointerTests_win.cpp b/src/dawn/tests/end2end/BufferHostMappedPointerTests_win.cpp
index 9cd025e..4799f26 100644
--- a/src/dawn/tests/end2end/BufferHostMappedPointerTests_win.cpp
+++ b/src/dawn/tests/end2end/BufferHostMappedPointerTests_win.cpp
@@ -25,11 +25,11 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <windows.h>
 #include <utility>
 
 #include "dawn/common/Log.h"
 #include "dawn/common/MutexProtected.h"
+#include "dawn/common/windows_with_undefs.h"
 #include "dawn/tests/MockCallback.h"
 #include "dawn/tests/end2end/BufferHostMappedPointerTests.h"
 

src/dawn/utils/WindowsTimer.cpp

diff --git a/src/dawn/utils/WindowsTimer.cpp b/src/dawn/utils/WindowsTimer.cpp
index 5787ee8..186d24e 100644
--- a/src/dawn/utils/WindowsTimer.cpp
+++ b/src/dawn/utils/WindowsTimer.cpp
@@ -25,8 +25,7 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <windows.h>
-
+#include "dawn/common/windows_with_undefs.h"
 #include "dawn/utils/Timer.h"
 
 namespace dawn::utils {