From: Christian Heimes <christian@cheimes.de>
Date: Thu, 2 Oct 2008 18:39:50 +0000 (+0000)
Subject: Merged revisions 66739 via svnmerge from
X-Git-Tag: v2.6.1~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7f315a3abcd22aa8cb4e4a864c11861e40d8595;p=thirdparty%2FPython%2Fcpython.git

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 5deb9ec34deb..c62905acfb76 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 079c83171b1e..489e8bbe1f14 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);