Merge 3.4 (#24217)

60e3f367 · Benjamin Peterson · 32ba405c · f6b5cad3 · 60e3f367
Commit 60e3f367 authored Aug 02, 2015 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Modules/mmapmodule.c Modules/mmapmodule.c +2 -2

No files found.
--- 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