(fcntl.h): Test only HAVE_FCNTL_H.

612221ab · Richard M. Stallman · 321ce330 · 612221ab · 612221ab
Commit 612221ab authored Dec 04, 2002 by Richard M. Stallman
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

src/fileio.c src/fileio.c +1 -1

src/sysdep.c src/sysdep.c +1 -9

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


--- 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>