From 612221ab83f69a690595eb83eab0e2e606493279 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Wed, 4 Dec 2002 11:44:34 +0000
Subject: [PATCH] (fcntl.h): Test only HAVE_FCNTL_H.

---
 src/fileio.c |  2 +-
 src/sysdep.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/fileio.c b/src/fileio.c
index 0b06e4fee34..890ef2de371 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 
-#if defined (USG5) || defined (BSD_SYSTEM) || defined (GNU_LINUX)
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
diff --git a/src/sysdep.c b/src/sysdep.c
index 28ab676c69c..322869eb71e 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -147,17 +147,9 @@ extern int errno;
 #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>
-- 
2.39.2