1 files changed, 22 insertions, 6 deletions

diff --git a/src/mongo/client/redef_macros.h b/src/mongo/client/redef_macros.h
index 46c9ffb80b8..15e838cf6d5 100644
--- a/src/mongo/client/redef_macros.h
+++ b/src/mongo/client/redef_macros.h
@@ -1,4 +1,4 @@
-/** @file redef_macros.h macros the implementation uses.
+/** @file redef_macros.h macros for mongo internals
     
     @see undef_macros.h undefines these after use to minimize name pollution.
 */
@@ -20,42 +20,58 @@
 
 // If you define a new global un-prefixed macro, please add it here and in undef_macros
 
-// #pragma once // this file is intended to be processed multiple times
-
-#if defined(MONGO_MACROS_CLEANED)
+#define MONGO_MACROS_PUSHED 1
 
 // util/allocator.h
 #pragma push_macro("malloc")
 #define malloc MONGO_malloc
+#pragma push_macro("realloc")
 #define realloc MONGO_realloc
 
 // util/assert_util.h
+#pragma push_macro("verify")
 #define verify MONGO_verify
+#pragma push_macro("dassert")
 #define dassert MONGO_dassert
+#pragma push_macro("wassert")
 #define wassert MONGO_wassert
+#pragma push_macro("massert")
 #define massert MONGO_massert
+#pragma push_macro("uassert")
 #define uassert MONGO_uassert
+#pragma push_macro("DESTRUCTOR_GUARD")
 #define DESTRUCTOR_GUARD MONGO_DESTRUCTOR_GUARD
 
 // util/goodies.h
+#pragma push_macro("PRINT")
 #define PRINT MONGO_PRINT
+#pragma push_macro("PRINTFL")
 #define PRINTFL MONGO_PRINTFL
+#pragma push_macro("asctime")
 #define asctime MONGO_asctime
+#pragma push_macro("gmtime")
 #define gmtime MONGO_gmtime
+#pragma push_macro("localtime")
 #define localtime MONGO_localtime
+#pragma push_macro("ctime")
 #define ctime MONGO_ctime
 
 // util/debug_util.h
+#pragma push_macro("DEV")
 #define DEV MONGO_DEV
+#pragma push_macro("DEBUGGING")
 #define DEBUGGING MONGO_DEBUGGING
+#pragma push_macro("SOMETIMES")
 #define SOMETIMES MONGO_SOMETIMES
+#pragma push_macro("OCCASIONALLY")
 #define OCCASIONALLY MONGO_OCCASIONALLY
+#pragma push_macro("RARELY")
 #define RARELY MONGO_RARELY
+#pragma push_macro("ONCE")
 #define ONCE MONGO_ONCE
 
 // util/log.h
+#pragma push_macro("LOG")
 #define LOG MONGO_LOG
 
-#undef MONGO_MACROS_CLEANED
-#endif