AK: Simplify usage of windows.h and winsock2.h

Use <AK/Windows.h> instead of windows.h/winsock2.h to avoid timeval-related errors. Note: winsock2.h includes windows.h
LadybirdBrowser · Dec 9, 2024 · c2ab1d6 · c2ab1d6
1 parent ac590fe
commit c2ab1d6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/AK/CMakeLists.txt b/AK/CMakeLists.txt
@@ -75,6 +75,7 @@ if (BUILD_SHARED_LIBS AND NOT CMAKE_SKIP_INSTALL_RULES AND NOT "${VCPKG_INSTALLE
 endif()
 
 if (ENABLE_SWIFT)
+    set(SWIFT_EXCLUDE_HEADERS Windows.h)
     generate_clang_module_map(AK
        GENERATED_FILES
         "${CMAKE_CURRENT_BINARY_DIR}/Backtrace.h"

diff --git a/AK/Time.cpp b/AK/Time.cpp
@@ -8,9 +8,7 @@
 #include <AK/Time.h>
 
 #ifdef AK_OS_WINDOWS
-#    define timeval dummy_timeval
-#    include <windows.h>
-#    undef timeval
+#    include <AK/Windows.h>
 #endif
 
 namespace AK {

diff --git a/AK/Windows.h b/AK/Windows.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024, stasoid <stasoid@yahoo.com>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <AK/Platform.h>
+
+#define timeval dummy_timeval
+#include <winsock2.h>
+#undef timeval
+#include <io.h>