Merged revisions 66616 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66616 | martin.v.loewis | 2008-09-25 06:12:50 +0200 (Do, 25 Sep 2008) | 2 lines

  Bug #3951: Py_USING_MEMORY_DEBUGGER should not be enabled by default.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 10799600368555f508e6318cd29df608711d5a97..c1ab3d381d4b34c7f430337610c658212f0c2c87 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,8 @@ Core and Builtins
 - Issue #1688: On Windows, the input() prompt was not correctly displayed if it
   contains non-ascii characters.
 
+- Bug #3951: Py_USING_MEMORY_DEBUGGER should not be enabled by default.
+
 Library
 -------
 

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index fc5ccf7abee2c6b7cca91abdef498613f1a2c600..d1586c29f888bb7310f439fb4d988804a88edd79 100644 (file)
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -677,8 +677,8 @@ extremely desirable that it be this fast.
 /* This is only useful when running memory debuggers such as
  * Purify or Valgrind.  Uncomment to use.
  *
- */
 #define Py_USING_MEMORY_DEBUGGER
+ */
 
 #ifdef Py_USING_MEMORY_DEBUGGER