1 files changed, 47 insertions, 6 deletions
diff --git a/client/redef_macros.h b/client/redef_macros.h
index 897912d..5a39561 100644
--- a/client/redef_macros.h
+++ b/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,83 @@
 
 // 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")
+#undef malloc
 #define malloc MONGO_malloc
+#pragma push_macro("realloc")
+#undef realloc
 #define realloc MONGO_realloc
 
 // util/assert_util.h
+#pragma push_macro("assert")
+#undef assert
 #define assert MONGO_assert
+#pragma push_macro("verify")
+#undef verify
+#define verify MONGO_verify
+#pragma push_macro("dassert")
+#undef dassert
 #define dassert MONGO_dassert
+#pragma push_macro("wassert")
+#undef wassert
 #define wassert MONGO_wassert
+#pragma push_macro("massert")
+#undef massert
 #define massert MONGO_massert
+#pragma push_macro("uassert")
+#undef uassert
 #define uassert MONGO_uassert
 #define BOOST_CHECK_EXCEPTION MONGO_BOOST_CHECK_EXCEPTION
+#pragma push_macro("DESTRUCTOR_GUARD")
+#undef DESTRUCTOR_GUARD
 #define DESTRUCTOR_GUARD MONGO_DESTRUCTOR_GUARD
 
 // util/goodies.h
+#pragma push_macro("PRINT")
+#undef PRINT
 #define PRINT MONGO_PRINT
+#pragma push_macro("PRINTFL")
+#undef PRINTFL
 #define PRINTFL MONGO_PRINTFL
+#pragma push_macro("asctime")
+#undef asctime
 #define asctime MONGO_asctime
+#pragma push_macro("gmtime")
+#undef gmtime
 #define gmtime MONGO_gmtime
+#pragma push_macro("localtime")
+#undef localtime
 #define localtime MONGO_localtime
+#pragma push_macro("ctime")
+#undef ctime
 #define ctime MONGO_ctime
 
 // util/debug_util.h
+#pragma push_macro("DEV")
+#undef DEV
 #define DEV MONGO_DEV
+#pragma push_macro("DEBUGGING")
+#undef DEBUGGING
 #define DEBUGGING MONGO_DEBUGGING
+#pragma push_macro("SOMETIMES")
+#undef SOMETIMES
 #define SOMETIMES MONGO_SOMETIMES
+#pragma push_macro("OCCASIONALLY")
+#undef OCCASIONALLY
 #define OCCASIONALLY MONGO_OCCASIONALLY
+#pragma push_macro("RARELY")
+#undef RARELY
 #define RARELY MONGO_RARELY
+#pragma push_macro("ONCE")
+#undef ONCE
 #define ONCE MONGO_ONCE
 
 // util/log.h
+#pragma push_macro("LOG")
+#undef LOG
 #define LOG MONGO_LOG
 
-#undef MONGO_MACROS_CLEANED
-#endif