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

[benjamin.peterson]

https://hg.python.org/cpython/rev/25ba5e7af08a
changeset:   97210:25ba5e7af08a
branch:      3.5
parent:      97207:1f81c9ab44b1
parent:      97209:1838f37a8d9e
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Aug 02 12:16:45 2015 -0700
summary:
  Merge 3.4 (#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