summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-12-28 23:41:09 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-12-28 23:41:09 (GMT)
commitf85dbfc3d21e5a650468f20547175107b3bf319b (patch)
tree51f586f8a270bb23260f27207d1c1c904c7bdb4f
parentf04790a4b70bd2f9a2f74c032c3b4a4ffb1a9127 (diff)
downloadcpython-f85dbfc3d21e5a650468f20547175107b3bf319b.zip
cpython-f85dbfc3d21e5a650468f20547175107b3bf319b.tar.gz
cpython-f85dbfc3d21e5a650468f20547175107b3bf319b.tar.bz2
Issue #28768: Fix implicit declaration of function _setmode. Patch by Masayuki Yamamoto
-rw-r--r--Misc/ACKS3
-rw-r--r--Misc/NEWS6
-rw-r--r--Modules/_io/fileio.c3
-rw-r--r--Modules/main.c3
4 files changed, 14 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 223b3a8..647d59d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1548,6 +1548,7 @@ Robert Xiao
Florent Xicluna
Alakshendra Yadav
Hirokazu Yamamoto
+Masayuki Yamamoto
Ka-Ping Yee
Jason Yeo
EungJun Yi
@@ -1574,4 +1575,4 @@ Tarek Ziadé
Jelle Zijlstra
Gennadiy Zlobin
Peter Ã…strand
-Dhushyanth Ramasamy \ No newline at end of file
+Dhushyanth Ramasamy
diff --git a/Misc/NEWS b/Misc/NEWS
index 2a211dd..2be1434 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,12 @@ Library
- Issue #28925: cPickle now correctly propagates errors when unpickle instances
of old-style classes.
+Build
+-----
+
+- Issue #28768: Fix implicit declaration of function _setmode. Patch by
+ Masayuki Yamamoto
+
What's New in Python 2.7.13
===========================
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 0678ef8..4a71a57 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -8,6 +8,9 @@
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
diff --git a/Modules/main.c b/Modules/main.c
index 44217c6..73e87e0 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -10,6 +10,9 @@
#endif
#if defined(MS_WINDOWS) || defined(__CYGWIN__)
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif