diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
index 2a786ef0eef..02b931e2dc2 100644
--- a/storage/connect/libdoc.cpp
+++ b/storage/connect/libdoc.cpp
@@ -30,11 +30,11 @@ extern char version[];
 extern int  trace;
 } //   "C"
 
-#if defined(_DEBUG)
-static xmlFreeFunc Free; 
-static xmlMallocFunc Malloc;
-static xmlMallocFunc MallocA; 
-static xmlReallocFunc Realloc; 
+#if defined(MEMORY_TRACE)
+static xmlFreeFunc Free; 
+static xmlMallocFunc Malloc;
+static xmlMallocFunc MallocA; 
+static xmlReallocFunc Realloc; 
 static xmlStrdupFunc Strdup;
 
 void xmlMyFree(void *mem)
@@ -75,7 +75,7 @@ char *xmlMyStrdup(const char *str)
     htrc("Duplicating      to %p from %p %s\n", p, str, str);
   return p;
 } // end of xmlMyStrdup
-#endif   // _DEBUG
+#endif   // MEMORY_TRACE
 
 /******************************************************************/
 /*  Return a LIBXMLDOC as a XMLDOC.                               */
@@ -91,17 +91,17 @@ PXDOC GetLibxmlDoc(PGLOBAL g, char *nsl, char *nsdf,
 /******************************************************************/
 void XmlInitParserLib(void)
   {
-#if defined(_DEBUG)
+#if defined(MEMORY_TRACE)
 int	rc = xmlGcMemGet(&Free, &Malloc, &MallocA, &Realloc, &Strdup);
 
 if (!rc)
-  rc = xmlGcMemSetup(xmlMyFree, 
-                     xmlMyMalloc, 
-                     xmlMyMallocAtomic,
-                     xmlMyRealloc,
-                     xmlMyStrdup); 
+  rc = xmlGcMemSetup(xmlMyFree, 
+                     xmlMyMalloc, 
+                     xmlMyMallocAtomic,
+                     xmlMyRealloc,
+                     xmlMyStrdup); 
 
-#endif   // _DEBUG
+#endif   // MEMORY_TRACE
   xmlInitParser();
   } // end of XmlInitParserLib