summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2012-11-01 22:39:09 -0400
committerEliot Horowitz <eliot@10gen.com>2012-11-02 15:42:59 -0400
commitc03c0a2e8b0ac6d93c2c3e1fe309c18201b63fe2 (patch)
treeb172c0168b910b5d645fb8af8d602ba80e34d775
parenta28ea293ee0e9f0b3efc152dbdeb8d4afb408dcf (diff)
downloadmongo-c03c0a2e8b0ac6d93c2c3e1fe309c18201b63fe2.tar.gz
don't include MONGO_MALLOC redef if we don't need it
-rw-r--r--src/mongo/client/redef_macros.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mongo/client/redef_macros.h b/src/mongo/client/redef_macros.h
index ceef2168d05..fc9db383de1 100644
--- a/src/mongo/client/redef_macros.h
+++ b/src/mongo/client/redef_macros.h
@@ -23,12 +23,14 @@
#define MONGO_MACROS_PUSHED 1
// util/allocator.h
+#ifdef MONGO_MALLOC
#pragma push_macro("malloc")
#undef malloc
#define malloc MONGO_malloc
#pragma push_macro("realloc")
#undef realloc
#define realloc MONGO_realloc
+#endif
// util/assert_util.h
#pragma push_macro("verify")