summaryrefslogtreecommitdiff
path: root/xfa/fgas/crt/fgas_memory.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-05-05 10:57:41 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-05 10:57:41 -0700
commit1f00dbf0203bdd6b4100457301fef1216546e2f7 (patch)
treeaaa9dc13c590039a15118a0c48e752fac2ff4701 /xfa/fgas/crt/fgas_memory.cpp
parentb4d40ffae3f955fab2fac838430c89aca452c45f (diff)
downloadpdfium-1f00dbf0203bdd6b4100457301fef1216546e2f7.tar.xz
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
Diffstat (limited to 'xfa/fgas/crt/fgas_memory.cpp')
-rw-r--r--xfa/fgas/crt/fgas_memory.cpp2
1 files changed, 2 insertions, 0 deletions
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 <algorithm>