aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2002-12-04 11:44:34 +0000
committerRichard M. Stallman2002-12-04 11:44:34 +0000
commit612221ab83f69a690595eb83eab0e2e606493279 (patch)
tree7a327188160a1eafa7a065642b0930dc1a6c0a6f /src
parent321ce330a7ea576edd4fba5c463f992f1da5f250 (diff)
downloademacs-612221ab83f69a690595eb83eab0e2e606493279.tar.gz
emacs-612221ab83f69a690595eb83eab0e2e606493279.zip
(fcntl.h): Test only HAVE_FCNTL_H.
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c2
-rw-r--r--src/sysdep.c10
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. */
21 21
22#include <config.h> 22#include <config.h>
23 23
24#if defined (USG5) || defined (BSD_SYSTEM) || defined (GNU_LINUX) 24#ifdef HAVE_FCNTL_H
25#include <fcntl.h> 25#include <fcntl.h>
26#endif 26#endif
27 27
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;
147#include <sys/file.h> 147#include <sys/file.h>
148#endif /* not VMS */ 148#endif /* not VMS */
149 149
150#ifndef BSD4_1 150#ifdef HAVE_FCNTL_H
151#ifdef BSD_SYSTEM /* avoid writing defined (BSD_SYSTEM) || defined (USG)
152 because the vms compiler doesn't grok `defined' */
153#include <fcntl.h> 151#include <fcntl.h>
154#endif 152#endif
155#ifdef USG
156#ifndef USG5
157#include <fcntl.h>
158#endif
159#endif
160#endif /* not 4.1 bsd */
161 153
162#ifndef MSDOS 154#ifndef MSDOS
163#include <sys/ioctl.h> 155#include <sys/ioctl.h>