[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#24217)

Sun Aug 2 21:17:46 CEST 2015

https://hg.python.org/cpython/rev/4ed9cc2203b3
changeset: 97211:4ed9cc2203b3
parent: 97208:1d44d4addc17
parent: 97210:25ba5e7af08a
user: Benjamin Peterson <benjamin at python.org>
date: Sun Aug 02 12:16:54 2015 -0700
summary:
 merge 3.5 (#24217)
files:
 Modules/mmapmodule.c | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -24,9 +24,9 @@
 
 #ifndef MS_WINDOWS
 #define UNIX
-# ifdef __APPLE__
+# ifdef HAVE_FCNTL_H
 # include <fcntl.h>
-# endif
+# endif /* HAVE_FCNTL_H */
 #endif
 
 #ifdef MS_WINDOWS
-- 
Repository URL: https://hg.python.org/cpython
