Bug 1730275 - Move util/Windows.h to util/WindowsWrapper.h so that ut…

…il/moz.build can be added in a subsequent rev without inducing <windows.h>/"Windows.h" conflicts. r=jandem Differential Revision: https://phabricator.services.mozilla.com/D125902
iaxat · Sep 17, 2021 · e6c31ee · e6c31ee
1 parent efaa2eb
commit e6c31ee
Show file tree

Hide file tree

Showing 28 changed files with 31 additions and 31 deletions.
diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py
@@ -153,7 +153,7 @@
         "frontend/ReservedWordsGenerated.h",
         "gc/StatsPhasesGenerated.h",  # Included in the body of gc/Statistics.h
         "gc/StatsPhasesGenerated.inc",  # Included in the body of gc/Statistics.cpp
-        "psapi.h",  # Must be included after "util/Windows.h" on Windows
+        "psapi.h",  # Must be included after "util/WindowsWrapper.h" on Windows
         "machine/endian.h",  # Must be included after <sys/types.h> on BSD
         "winbase.h",  # Must precede other system headers(?)
         "windef.h",  # Must precede other system headers(?)

diff --git a/js/src/builtin/DataViewObject.cpp b/js/src/builtin/DataViewObject.cpp
@@ -27,7 +27,7 @@
 #include "js/PropertySpec.h"
 #include "js/Wrapper.h"
 #include "util/DifferentialTesting.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/ArrayBufferObject.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"

diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
@@ -57,7 +57,7 @@
 #include "js/Vector.h"
 #include "util/Text.h"
 #include "util/Unicode.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/JSContext.h"
 #include "vm/JSFunction.h"
 #include "vm/JSObject.h"

diff --git a/js/src/devtools/vprof/vprof.cpp b/js/src/devtools/vprof/vprof.cpp
@@ -9,7 +9,7 @@
 // running in the same process.
 
 #ifdef WIN32
-#  include "util/Windows.h"
+#  include "util/WindowsWrapper.h"
 #else
 #  define __cdecl
 #  include <stdarg.h>

diff --git a/js/src/ds/MemoryProtectionExceptionHandler.cpp b/js/src/ds/MemoryProtectionExceptionHandler.cpp
@@ -10,7 +10,7 @@
 #include "mozilla/Atomics.h"
 
 #if defined(XP_WIN)
-#  include "util/Windows.h"
+#  include "util/WindowsWrapper.h"
 #elif defined(__wasi__)
 // Nothing.
 #elif defined(XP_UNIX) && !defined(XP_DARWIN)

diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
@@ -240,7 +240,7 @@
 #include "proxy/DeadObjectProxy.h"
 #include "util/DifferentialTesting.h"
 #include "util/Poison.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/BigIntType.h"
 #include "vm/GetterSetter.h"
 #include "vm/HelperThreadState.h"

diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
@@ -17,7 +17,7 @@
 
 #ifdef XP_WIN
 
-#  include "util/Windows.h"
+#  include "util/WindowsWrapper.h"
 #  include <psapi.h>
 
 #else

diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
@@ -56,7 +56,7 @@
 #include "js/Printf.h"
 #include "js/UniquePtr.h"
 #include "util/Memory.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/HelperThreads.h"
 #include "vm/Realm.h"
 #include "vm/TraceLogging.h"

diff --git a/js/src/jit/ProcessExecutableMemory.cpp b/js/src/jit/ProcessExecutableMemory.cpp
@@ -27,7 +27,7 @@
 #include "threading/Mutex.h"
 #include "util/Memory.h"
 #include "util/Poison.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/MutexIDs.h"
 
 #ifdef XP_WIN

diff --git a/js/src/jit/arm64/vixl/MozCpu-vixl.cpp b/js/src/jit/arm64/vixl/MozCpu-vixl.cpp
@@ -27,7 +27,7 @@
 #include "jit/arm64/vixl/Cpu-vixl.h"
 #include "jit/arm64/vixl/Simulator-vixl.h"
 #include "jit/arm64/vixl/Utils-vixl.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 
 #if defined(XP_DARWIN)
 #  include <libkern/OSCacheControl.h>

diff --git a/js/src/jsapi-tests/testGCAllocator.cpp b/js/src/jsapi-tests/testGCAllocator.cpp
@@ -11,7 +11,7 @@
 #include "jsapi-tests/tests.h"
 
 #if defined(XP_WIN)
-#  include "util/Windows.h"
+#  include "util/WindowsWrapper.h"
 #  include <psapi.h>
 #elif defined(__wasi__)
 // Nothing.

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
@@ -4190,7 +4190,7 @@ JS_PUBLIC_API bool JS_GetGlobalJitCompilerOption(JSContext* cx,
 #if !defined(STATIC_EXPORTABLE_JS_API) && !defined(STATIC_JS_API) && \
     defined(XP_WIN)
 
-#  include "util/Windows.h"
+#  include "util/WindowsWrapper.h"
 
 /*
  * Initialization routine for the JS DLL.

diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
@@ -25,7 +25,7 @@
 #include "jit/InlinableNatives.h"
 #include "js/Class.h"
 #include "js/PropertySpec.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/JSAtom.h"
 #include "vm/JSContext.h"
 #include "vm/Realm.h"

diff --git a/js/src/shell/OSObject.cpp b/js/src/shell/OSObject.cpp
@@ -47,7 +47,7 @@
 #include "util/GetPidProvider.h"  // getpid()
 #include "util/StringBuffer.h"
 #include "util/Text.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/JSObject.h"
 #include "vm/TypedArrayObject.h"
 

diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
@@ -168,7 +168,7 @@
 #include "util/DifferentialTesting.h"
 #include "util/StringBuffer.h"
 #include "util/Text.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/Compression.h"
 #include "vm/ErrorObject.h"

diff --git a/js/src/threading/windows/CpuCount.cpp b/js/src/threading/windows/CpuCount.cpp
@@ -5,7 +5,7 @@
 
 #include "threading/CpuCount.h"
 
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 
 uint32_t js::GetCPUCount() {
   static uint32_t ncpus = 0;

diff --git a/js/src/threading/windows/ThreadPlatformData.h b/js/src/threading/windows/ThreadPlatformData.h
@@ -13,7 +13,7 @@
 
 #include "threading/Thread.h"
 
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 
 namespace js {
 

diff --git a/js/src/util/NativeStack.cpp b/js/src/util/NativeStack.cpp
@@ -9,7 +9,7 @@
 #include "mozilla/Assertions.h"  // MOZ_ASSERT, MOZ_RELEASE_ASSERT, MOZ_CRASH
 
 #ifdef XP_WIN
-#  include "util/Windows.h"
+#  include "util/WindowsWrapper.h"
 #elif defined(__wasi__)
 // Nothing
 #elif defined(XP_DARWIN) || defined(DARWIN) || defined(XP_UNIX)

diff --git a/js/src/util/Utility.cpp b/js/src/util/Utility.cpp
@@ -18,7 +18,7 @@
 #include "jstypes.h"
 
 #include "util/Poison.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/HelperThreads.h"
 
 using namespace js;

diff --git a/js/src/util/Windows.h → js/src/util/WindowsWrapper.h b/js/src/util/Windows.h → js/src/util/WindowsWrapper.h
@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef util_Windows_h
-#define util_Windows_h
+#ifndef util_WindowsWrapper_h
+#define util_WindowsWrapper_h
 
 /*
  * This file is a wrapper around <windows.h> to prevent the mangling of
@@ -25,4 +25,4 @@
 #  undef PASSTHROUGH
 #endif
 
-#endif /* util_Windows_h */
+#endif /* util_WindowsWrapper_h */
diff --git a/js/src/vm/ArrayBufferObject.cpp b/js/src/vm/ArrayBufferObject.cpp
@@ -45,7 +45,7 @@
 #include "js/PropertySpec.h"
 #include "js/SharedArrayBuffer.h"
 #include "js/Wrapper.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
 #include "vm/JSContext.h"

diff --git a/js/src/vm/JSContext.cpp b/js/src/vm/JSContext.cpp
@@ -54,7 +54,7 @@
 #include "util/DoubleToString.h"
 #include "util/NativeStack.h"
 #include "util/Text.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/BytecodeUtil.h"  // JSDVG_IGNORE_STACK
 #include "vm/ErrorObject.h"
 #include "vm/ErrorReporting.h"

diff --git a/js/src/vm/JSObject.cpp b/js/src/vm/JSObject.cpp
@@ -50,7 +50,7 @@
 #include "proxy/DeadObjectProxy.h"
 #include "util/Memory.h"
 #include "util/Text.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/BytecodeUtil.h"
 #include "vm/DateObject.h"

diff --git a/js/src/vm/Printer.cpp b/js/src/vm/Printer.cpp
@@ -17,7 +17,7 @@
 #include "js/CharacterEncoding.h"
 #include "util/Memory.h"
 #include "util/Text.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/JSContext.h"
 
 using mozilla::PodCopy;

diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
@@ -41,7 +41,7 @@
 #if JS_HAS_INTL_API
 #  include "unicode/uloc.h"
 #endif
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/DateTime.h"
 #include "vm/JSAtom.h"
 #include "vm/JSObject.h"

diff --git a/js/src/vm/TypedArrayObject.cpp b/js/src/vm/TypedArrayObject.cpp
@@ -37,7 +37,7 @@
 #include "js/Wrapper.h"
 #include "util/DifferentialTesting.h"
 #include "util/Text.h"
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 #include "vm/ArrayBufferObject.h"
 #include "vm/FunctionFlags.h"  // js::FunctionFlags
 #include "vm/GlobalObject.h"

diff --git a/js/src/vtune/ittnotify_config.h b/js/src/vtune/ittnotify_config.h
@@ -244,7 +244,7 @@
 
 /* OS communication functions */
 #if ITT_PLATFORM==ITT_PLATFORM_WIN
-#include "util/Windows.h"
+#include "util/WindowsWrapper.h"
 typedef HMODULE           lib_t;
 typedef DWORD             TIDT;
 typedef CRITICAL_SECTION  mutex_t;

diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
@@ -28,8 +28,8 @@
 #include "wasm/WasmInstance.h"
 
 #if defined(XP_WIN)
-#  include <winternl.h>  // must include before util/Windows.h's `#undef`s
-#  include "util/Windows.h"
+#  include <winternl.h>  // must include before util/WindowsWrapper.h's `#undef`s
+#  include "util/WindowsWrapper.h"
 #elif defined(XP_DARWIN)
 #  include <mach/exc.h>
 #  include <mach/mach.h>