summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-10-02 18:39:50 +0000
committerChristian Heimes <christian@cheimes.de>2008-10-02 18:39:50 +0000
commitc7f315a3abcd22aa8cb4e4a864c11861e40d8595 (patch)
tree8a80e1b94d1f89b4e2ee39e2141e2af4917933e1
parentcf14b6be5478d77bb5ae2f2742d5af708e242f9a (diff)
downloadcpython-git-c7f315a3abcd22aa8cb4e4a864c11861e40d8595.tar.gz
Merged revisions 66739 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66739 | christian.heimes | 2008-10-02 20:33:41 +0200 (Thu, 02 Oct 2008) | 1 line Fixed a comment to C89 style as of http://drj11.wordpress.com/2008/10/02/python-and-bragging-about-c89/ ........
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/frameobject.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 5deb9ec34d..c62905acfb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6.1 alpha 1
Core and Builtins
-----------------
+- Fixed a broken comment in Objects/frameobject.c. Python is now C89 compatible
+ again.
+
Library
-------
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 079c83171b..489e8bbe1f 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -517,7 +517,7 @@ frame_sizeof(PyFrameObject *f)
nfrees = PyTuple_GET_SIZE(f->f_code->co_freevars);
extras = f->f_code->co_stacksize + f->f_code->co_nlocals +
ncells + nfrees;
- // subtract one as it is already included in PyFrameObject
+ /* subtract one as it is already included in PyFrameObject */
res = sizeof(PyFrameObject) + (extras-1) * sizeof(PyObject *);
return PyInt_FromSsize_t(res);