[Python-3000-checkins] r66617 - in python/branches/py3k: Misc/NEWS Objects/obmalloc.c

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Sep 25 06:15:27 2008
New Revision: 66617

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Objects/obmalloc.c

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Sep 25 06:15:27 2008
@@ -15,6 +15,8 @@
 - 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
 -------
 

Modified: python/branches/py3k/Objects/obmalloc.c
==============================================================================
--- python/branches/py3k/Objects/obmalloc.c	(original)
+++ python/branches/py3k/Objects/obmalloc.c	Thu Sep 25 06:15:27 2008
@@ -677,8 +677,8 @@
 /* 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