2 files changed, 4 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 584d6a33947..754f0caf9db 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-10  Glenn Morris  <rgm@gnu.org>
 
+        * s/gnu.h: Don't include fcntl.h (every file in Emacs that uses
+        O_RDONLY already includes it).
+
         Stop ns builds setting the EMACSLOADPATH environment variable.
         * nsterm.m (ns_load_path): Rename from ns_init_paths.
         Now it does not set EMACSLOADPATH, just returns the load-path string.
diff --git a/src/s/gnu.h b/src/s/gnu.h
index a8e2c4cdbb8..8410ad666f5 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -24,10 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* libc defines data_start.  */
 #define DATA_START ({ extern int data_start; (char *) &data_start; })
 
-/* Some losing code fails to include this and then assumes
-   that because it is braindead that O_RDONLY==0.  */
-#include <fcntl.h>
-
+/* It would be harmless to drop the ifdef emacs test.  */
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
 #if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)