* src/s/gnu.h: Don't include fcntl.h

(every file in Emacs that uses O_RDONLY already includes it; and this
does not seem like the problem a src/s file should be trying to solve).

diff --git a/src/ChangeLog b/src/ChangeLog
index 584d6a339478200ca0f251439ad634b7bcef82a7..754f0caf9dbb1d48bc797f434d64df57c4117007 100644 (file)
--- 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 a8e2c4cdbb84ba3bc19378b828c7f00bf383296c..8410ad666f5321cd73e4b4900b0f86fd20db84ce 100644 (file)
--- 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)