Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset e59efc28ac89 (bug 1802675) for causing win10 2004 failures CLOSED TREE

Browse Source
This commit is contained in:
Cristian Tuns 2022-12-02 00:11:36 -05:00
parent 455bdd2fd9
commit c33879cb48
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
memory/mozalloc/moz.build
View File

@ -21,7 +21,7 @@ if CONFIG["WRAP_STL_INCLUDES"]:
"msvc_raise_wrappers.cpp",
]
if CONFIG["MOZ_MEMORY"] and CONFIG["OS_TARGET"] == "WINNT":
if CONFIG["OS_TARGET"] == "WINNT":
# Keep this file separate to avoid #include'ing windows.h everywhere.
SOURCES += [
"winheap.cpp",

8
memory/mozalloc/winheap.cpp
View File

@ -8,6 +8,14 @@
#include "mozilla/mozalloc.h"
#include <windows.h>
#if !defined(MOZ_MEMORY)
# include <malloc.h>
# define malloc_impl malloc
# define calloc_impl calloc
# define realloc_impl realloc
# define free_impl free
#endif
// Warning: C4273: 'HeapAlloc': inconsistent dll linkage
// The Windows headers define HeapAlloc as dllimport, but we define it as
// dllexport, which is a voluntary inconsistency.