From e5effb28c12482d3e939f8d714d38d32146f32ac Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 11 Mar 2015 08:27:22 +0900 Subject: [PATCH] Bug 1141731 - Avoid problems caused by the inclusion of mozmemory.h in mozalloc.cpp by including mozmemory_wrap.h instead. r=njn --- memory/mozalloc/mozalloc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/memory/mozalloc/mozalloc.cpp b/memory/mozalloc/mozalloc.cpp index b97d2017bc9e..694ff8a8a438 100644 --- a/memory/mozalloc/mozalloc.cpp +++ b/memory/mozalloc/mozalloc.cpp @@ -17,7 +17,7 @@ // mozalloc.cpp is part of the same library as mozmemory, thus MOZ_MEMORY_IMPL // is needed. #define MOZ_MEMORY_IMPL -#include "mozmemory.h" +#include "mozmemory_wrap.h" // See mozmemory_wrap.h for more details. This file is part of libmozglue, so // it needs to use _impl suffixes. However, with libmozglue growing, this is