Bug 1263657 - Fixed WindowsDllBlocklist.cpp if MOZ_MEMORY is not defined. r=glandium
authorJacek Caban <jacek@codeweavers.com>
Tue, 12 Apr 2016 12:37:37 +0200
changeset 292786 13bb9febca01431b9ed8217be841b615156d915e
parent 292785 a2d94f934b2a733fa09e8f1097ee6fe07d7a2ad1
child 292787 7a3813330df614bf841937c242be13f36424883f
push id74977
push userjacek@codeweavers.com
push dateTue, 12 Apr 2016 10:38:29 +0000
treeherdermozilla-inbound@7a3813330df6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1263657
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1263657 - Fixed WindowsDllBlocklist.cpp if MOZ_MEMORY is not defined. r=glandium
mozglue/build/WindowsDllBlocklist.cpp
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -1,21 +1,23 @@
 /* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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
 // See mozmemory_wrap.h for more details. This file is part of libmozglue, so
 // it needs to use _impl suffixes.
 #define MALLOC_DECL(name, return_type, ...) \
   extern "C" MOZ_MEMORY_API return_type name ## _impl(__VA_ARGS__);
 #include "malloc_decls.h"
+#endif
 
 #include <windows.h>
 #include <winternl.h>
 #include <io.h>
 
 #pragma warning( push )
 #pragma warning( disable : 4275 4530 ) // See msvc-stl-wrapper.template.h
 #include <map>