summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-09-25 04:15:27 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-09-25 04:15:27 (GMT)
commit6fea2339d84fb46826834fd3e1721d8814849319 (patch)
tree7fa43c03e7fa100a5baf36fdda75a522d399dd84
parent78cb491de3726c35c799448dfb5c29e550c442a1 (diff)
downloadcpython-6fea2339d84fb46826834fd3e1721d8814849319.zip
cpython-6fea2339d84fb46826834fd3e1721d8814849319.tar.gz
cpython-6fea2339d84fb46826834fd3e1721d8814849319.tar.bz2
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. ........
-rw-r--r--Misc/NEWS2
-rw-r--r--Objects/obmalloc.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 1079960..c1ab3d3 100644
--- 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 fc5ccf7..d1586c2 100644
--- 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