Mercurial > emacs

changeset 48652:682129896be4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(fcntl.h): Test only HAVE_FCNTL_H.
author Richard M. Stallman <rms@gnu.org>
date Wed, 04 Dec 2002 11:44:34 +0000
parents 572f41d9a2ea
children eafa82fa3d92
files src/fileio.c src/sysdep.c
diffstat 2 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/fileio.c	Wed Dec 04 11:43:05 2002 +0000
+++ b/src/fileio.c	Wed Dec 04 11:44:34 2002 +0000
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#if defined (USG5) || defined (BSD_SYSTEM) || defined (GNU_LINUX)
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
--- a/src/sysdep.c	Wed Dec 04 11:43:05 2002 +0000
+++ b/src/sysdep.c	Wed Dec 04 11:44:34 2002 +0000
@@ -147,17 +147,9 @@
 #include <sys/file.h>
 #endif /* not VMS */
 
-#ifndef BSD4_1
-#ifdef BSD_SYSTEM /* avoid writing defined (BSD_SYSTEM) || defined (USG)
-	      because the vms compiler doesn't grok `defined' */
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef USG
-#ifndef USG5
-#include <fcntl.h>
-#endif
-#endif
-#endif /* not 4.1 bsd */
 
 #ifndef MSDOS
 #include <sys/ioctl.h>