From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 28 Dec 2016 23:41:09 +0000 (-0800)
Subject: Issue #28768: Fix implicit declaration of function _setmode. Patch by Masayuki Yamamoto
X-Git-Tag: v2.7.14rc1~306^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f85dbfc3d21e5a650468f20547175107b3bf319b;p=python

Issue #28768: Fix implicit declaration of function _setmode. Patch by Masayuki Yamamoto
---

diff --git a/Misc/ACKS b/Misc/ACKS
index 223b3a8be5..647d59de0a 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 2a211ddbc2..2be14345a4 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 0678ef8e35..4a71a57ec0 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 44217c67ca..73e87e08fd 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