mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 02:14:43 +00:00
Bug 1844908 - Remove pre-Win10-specific codepath from xpcom/. r=emilio
Differential Revision: https://phabricator.services.mozilla.com/D184308
This commit is contained in:
parent
9ec38aeba1
commit
c5739e2655
@ -7,7 +7,7 @@
|
||||
#include "mozilla/AvailableMemoryTracker.h"
|
||||
|
||||
#if defined(XP_WIN)
|
||||
# include "mozilla/WindowsVersion.h"
|
||||
# include <windows.h>
|
||||
# include "nsIMemoryReporter.h"
|
||||
#endif
|
||||
|
||||
@ -116,15 +116,11 @@ nsJemallocFreeDirtyPagesRunnable::Run() {
|
||||
|
||||
#if defined(XP_WIN)
|
||||
void nsJemallocFreeDirtyPagesRunnable::OptimizeSystemHeap() {
|
||||
// HeapSetInformation exists prior to Windows 8.1, but the
|
||||
// HeapOptimizeResources information class does not.
|
||||
if (IsWin8Point1OrLater()) {
|
||||
HEAP_OPTIMIZE_RESOURCES_INFORMATION heapOptInfo = {
|
||||
HEAP_OPTIMIZE_RESOURCES_CURRENT_VERSION};
|
||||
HEAP_OPTIMIZE_RESOURCES_INFORMATION heapOptInfo = {
|
||||
HEAP_OPTIMIZE_RESOURCES_CURRENT_VERSION};
|
||||
|
||||
::HeapSetInformation(nullptr, HeapOptimizeResources, &heapOptInfo,
|
||||
sizeof(heapOptInfo));
|
||||
}
|
||||
::HeapSetInformation(nullptr, HeapOptimizeResources, &heapOptInfo,
|
||||
sizeof(heapOptInfo));
|
||||
}
|
||||
#endif // defined(XP_WIN)
|
||||
|
||||
|
@ -38,7 +38,6 @@ using LibHandleResult = ::mozilla::Result<LibHandleType, DLErrorType>;
|
||||
|
||||
#if defined(XP_WIN)
|
||||
# include <mbstring.h>
|
||||
# include "mozilla/WindowsVersion.h"
|
||||
# include "mozilla/PreXULSkeletonUI.h"
|
||||
|
||||
static LibHandleResult GetLibHandle(pathstr_t aDependentLib) {
|
||||
@ -301,13 +300,6 @@ static XPCOMGlueLoadResult XPCOMGlueLoad(
|
||||
if (l == 0 || *buffer == '#') {
|
||||
continue;
|
||||
}
|
||||
# ifdef XP_WIN
|
||||
// There is no point in reading Universal CRT forwarder DLLs ahead on
|
||||
// Windows 10 because they will not be touched later.
|
||||
if (IsWin10OrLater() && !strncmp(buffer, "api-", 4)) {
|
||||
continue;
|
||||
}
|
||||
# endif
|
||||
|
||||
// cut the trailing newline, if present
|
||||
if (buffer[l - 1] == '\n') {
|
||||
|
Loading…
Reference in New Issue
Block a user