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/
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 5deb9ec34debf31bbdda45585f04bc52b7b943fe..c62905acfb76b97944765398c8212d89060138bf 100644 (file)
--- 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 079c83171b1e891e5128f5a9b164febe9683590b..489e8bbe1f14ccb2bd78600b0a65f17e32ac7d3b 100644 (file)
--- 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);