From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- memory/build/replace_malloc_bridge.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'memory/build/replace_malloc_bridge.h') diff --git a/memory/build/replace_malloc_bridge.h b/memory/build/replace_malloc_bridge.h index 6a0604d896..0e1a9e9f75 100644 --- a/memory/build/replace_malloc_bridge.h +++ b/memory/build/replace_malloc_bridge.h @@ -48,6 +48,12 @@ struct ReplaceMallocBridge; #include "mozilla/Types.h" +#ifdef _WIN32 +typedef void* platform_handle_t; +#else +typedef int platform_handle_t; +#endif + MOZ_BEGIN_EXTERN_C #ifndef REPLACE_MALLOC_IMPL @@ -124,9 +130,9 @@ class AddrInfo; // Callbacks to register debug file handles for Poison IO interpose. // See Mozilla(|Un)RegisterDebugHandle in xpcom/build/PoisonIOInterposer.h struct DebugFdRegistry { - virtual void RegisterHandle(intptr_t aFd); + virtual void RegisterHandle(platform_handle_t aFd); - virtual void UnRegisterHandle(intptr_t aFd); + virtual void UnRegisterHandle(platform_handle_t aFd); }; } // namespace mozilla -- cgit v1.2.3