From 2902ab6ff3168a4149c9beef051adc7c8a554cf6 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 12 Apr 2016 12:37:37 +0200 Subject: [PATCH] Bug 1263657 - Fixed WindowsDllBlocklist.cpp if MOZ_MEMORY is not defined. r=glandium --- mozglue/build/WindowsDllBlocklist.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp index 3e611aa9cc5d..38f3652b7465 100644 --- a/mozglue/build/WindowsDllBlocklist.cpp +++ b/mozglue/build/WindowsDllBlocklist.cpp @@ -3,6 +3,7 @@ * 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/. */ +#ifdef MOZ_MEMORY #define MOZ_MEMORY_IMPL #include "mozmemory_wrap.h" #define MALLOC_FUNCS MALLOC_FUNCS_MALLOC @@ -11,6 +12,7 @@ #define MALLOC_DECL(name, return_type, ...) \ extern "C" MOZ_MEMORY_API return_type name ## _impl(__VA_ARGS__); #include "malloc_decls.h" +#endif #include #include