[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2 (Issue #12404).

Sat Jun 25 10:14:19 CEST 2011

http://hg.python.org/cpython/rev/04182fa5255b
changeset: 70946:04182fa5255b
parent: 70943:024827a9db64
parent: 70945:567236a7122c
user: Ross Lagerwall <rosslagerwall at gmail.com>
date: Sat Jun 25 10:11:44 2011 +0200
summary:
 Merge with 3.2 (Issue #12404).
files:
 Misc/NEWS | 3 +++
 Modules/mmapmodule.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -200,6 +200,9 @@
 Library
 -------
 
+- Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira
+ Kitada.
+
 - Issue #1874: email now detects and reports as a defect the presence of
 any CTE other than 7bit, 8bit, or binary on a multipart.
 
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1162,12 +1162,13 @@
 # endif
 if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
 if (map_size == 0) {
+ off_t calc_size;
 if (offset >= st.st_size) {
 PyErr_SetString(PyExc_ValueError,
 "mmap offset is greater than file size");
 return NULL;
 }
- off_t calc_size = st.st_size - offset;
+ calc_size = st.st_size - offset;
 map_size = calc_size;
 if (map_size != calc_size) {
 PyErr_SetString(PyExc_ValueError,
-- 
Repository URL: http://hg.python.org/cpython
