Makefile next attempt

[wxWidgets.git] / include / wx / memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 1bc59b30582535e1eb6d0fdc49a4b4cbffca763d..9a17ad3ac99fc896b5be307f8ef0930b0eca221a 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MEMORYH__
-#define __MEMORYH__
+#ifndef _WX_MEMORYH__
+#define _WX_MEMORYH__
 
 #ifdef __GNUG__
 #pragma interface "memory.h"
@@ -23,7 +23,7 @@
   info, or to be a straight call to the new operator.
 */
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_WXDEBUG_CONTEXT
+#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
 
 #include <stddef.h>
 
@@ -275,5 +275,5 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 #endif // WXDEBUG
 
 #endif
-    // __MEMORYH__
+    // _WX_MEMORYH__