From 1f00dbf0203bdd6b4100457301fef1216546e2f7 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 5 May 2016 10:57:41 -0700 Subject: Only set memory tool define if not set. This fixes a build issue where MEMORY_TOOL_REPLACES_ALLOCATOR may already be set. Review-Url: https://codereview.chromium.org/1951383002 --- xfa/fgas/crt/fgas_memory.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'xfa/fgas/crt') diff --git a/xfa/fgas/crt/fgas_memory.cpp b/xfa/fgas/crt/fgas_memory.cpp index 2bd1e4da83..9176466a61 100644 --- a/xfa/fgas/crt/fgas_memory.cpp +++ b/xfa/fgas/crt/fgas_memory.cpp @@ -6,7 +6,9 @@ #include "xfa/fgas/crt/fgas_memory.h" +#ifndef MEMORY_TOOL_REPLACES_ALLOCATOR #define MEMORY_TOOL_REPLACES_ALLOCATOR // Temporary, for CF testing. +#endif #include -- cgit v1.2.3