* vfs.h: Include sys/timeb.h if it's present. Include time.h and

sys/time.h as recommended by Autoconf documentation.
* cpio.c: Remove all time-related includes - they are in vfs.h.
* extfs.c: Likewise.
* ftpfs.c: Likewise.
* mcfs.c: Likewise.
* mcserv.c: Likewise.
* tar.c: Likewise.
* util-alone.c: Likewise.
* vfs.c: Likewise. Include xdirentry.h.

vfs/ChangeLog

@@ -1,5 +1,16 @@
 2001-02-20  Pavel Roskin  <proski@gnu.org>
 
+	* vfs.h: Include sys/timeb.h if it's present. Include time.h and
+	sys/time.h as recommended by Autoconf documentation.
+	* cpio.c: Remove all time-related includes - they are in vfs.h.
+	* extfs.c: Likewise.
+	* ftpfs.c: Likewise.
+	* mcfs.c: Likewise.
+	* mcserv.c: Likewise.
+	* tar.c: Likewise.
+	* util-alone.c: Likewise.
+	* vfs.c: Likewise. Include xdirentry.h.
+
 	* extfs.c: Include xdirentry.h. Undefine ERRNOR before
 	redefining it.
 

vfs/cpio.c

@@ -23,10 +23,6 @@
 #include "../src/util.h"
 #include <glib.h>
 #include <errno.h>
-#ifdef SCO_FLAVOR
-#include <sys/timeb.h>
-#endif /* SCO_FLAVOR */
-#include <time.h>
 
 /* #include "utilvfs.h" */
 

vfs/extfs.c

@@ -37,10 +37,6 @@
 #include <sys/wait.h>
 #endif
 #include <errno.h>
-#ifdef SCO_FLAVOR
-#include <sys/timeb.h>	/* alex: for struct timeb definition */
-#endif /* SCO_FLAVOR */
-#include <time.h>
 #include "utilvfs.h"
 #include "../src/dialog.h"
 #include "../src/main.h"	/* For shell_execute */

vfs/ftpfs.c

@@ -66,9 +66,6 @@ What to do with this?
 #include <arpa/inet.h>
 #include <arpa/ftp.h>
 #include <arpa/telnet.h>
-#ifndef SCO_FLAVOR
-#	include <sys/time.h>	/* alex: this redefines struct timeval */
-#endif /* SCO_FLAVOR */
 #include <sys/param.h>
 
 #ifdef USE_TERMNET

vfs/mcfs.c

@@ -38,10 +38,6 @@
 #include <sys/socket.h>		/* AF_INET */
 #include <netinet/in.h>		/* struct in_addr */
 #include <arpa/inet.h>
-#ifdef SCO_FLAVOR
-#include <sys/timeb.h>	/* alex: for struct timeb definition */
-#endif /* SCO_FLAVOR */
-#include <time.h>
 
 #ifdef USE_TERMNET
 #include <termnet.h>

vfs/mcserv.c

@@ -66,11 +66,6 @@
 #include <sys/wait.h>
 #include <errno.h>
 #include <signal.h>
-#ifdef SCO_FLAVOR
-#     include <sys/timeb.h>	/* alex: for struct timeb definition */
-#endif /* SCO_FLAVOR */
-#include <time.h>
-#include <utime.h>
 
 /* Network include files */
 #include <sys/socket.h>

vfs/tar.c

@@ -22,10 +22,6 @@
 
 #include "xdirentry.h"
 #include <errno.h>
-#ifdef SCO_FLAVOR
-#include <sys/timeb.h>	/* alex: for struct timeb definition */
-#endif /* SCO_FLAVOR */
-#include <time.h>
 
 #include "utilvfs.h"
 

vfs/util-alone.c

@@ -19,18 +19,11 @@
 #include <fcntl.h>
 #include <signal.h>		/* my_system */
 #include <limits.h>		/* INT_MAX */
-#ifndef SCO_FLAVOR
-#	include <sys/time.h>	/* alex: sys/select.h defines struct timeval */
-#endif /* SCO_FLAVOR */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdarg.h>
 #include <errno.h>		/* my_system */
-#ifdef SCO_FLAVOR
-#	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
-#endif /* SCO_FLAVOR */
-#include <time.h>
 #ifndef OS2_NT
 #   include <pwd.h>
 #   include <grp.h>

vfs/vfs.c

@@ -42,11 +42,6 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <signal.h>
-#ifdef SCO_FLAVOR
-#include <sys/timeb.h>	/* alex: for struct timeb definition */
-#endif /* SCO_FLAVOR */
-#include <time.h>
-#include <sys/time.h>
 
 #include "utilvfs.h"
 
@@ -59,6 +54,7 @@
 #include "../src/dialog.h"
 #endif
 
+#include "xdirentry.h"
 #include "vfs.h"
 #include "extfs.h"		/* FIXME: we should not know anything about our modules */
 #include "names.h"

vfs/vfs.h

@@ -6,12 +6,19 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#if !defined(SCO_FLAVOR) || !defined(_SYS_SELECT_H) || defined(IS_AIX)
-#	include <sys/time.h>	/* alex: this redefines struct timeval */
-#  ifdef IS_AIX
-#       include <time.h>
+#ifdef HAVE_SYS_TIMEB_H
+#  include <sys/timeb.h>
+#endif
+#ifdef TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+#else
+#  ifdef HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#  else
+#    include <time.h>
 #  endif
-#endif /* SCO_FLAVOR */
+#endif
 
 #ifdef HAVE_UTIME_H
 #    include <utime.h>