From: Dave Love <fx@gnu.org>
Date: Fri, 23 Jun 2000 16:31:30 +0000 (+0000)
Subject: Use feature tests for fcntl.h, string.h.  Don't include time.h, done by
X-Git-Tag: emacs-pretest-21.0.90~3096
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5ef3cdf115590a8808c88ec48fcfb82f4b7f2f2;p=emacs.git

Use feature tests for fcntl.h, string.h.  Don't include time.h, done by
systime.h.
[__FreeBSD__]: Remove redundant includes.
---

diff --git a/src/filelock.c b/src/filelock.c
index 71fa7867cf0..4ca356f337f 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -32,33 +32,32 @@ Boston, MA 02111-1307, USA.  */
 #endif /* not VMS */
 
 #include <sys/file.h>
-#ifdef USG
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
-#endif /* USG */
+#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #ifdef __FreeBSD__
-#include <sys/time.h>
-#include <sys/types.h>
 #include <sys/sysctl.h>
 #endif /* __FreeBSD__ */
 
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
 #include "lisp.h"
 #include "buffer.h"
 #include "charset.h"
 #include "coding.h"
 #include "systime.h"
 
-#include <time.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
 /* The directory for writing temporary files.  */
 
 Lisp_Object Vtemporary_file_directory;