From: Nathan Bryant <loanshark@uncensored.citadel.org>
Date: Sun, 17 Jun 2001 19:42:24 +0000 (+0000)
Subject: fix all the <time.h> vs. <sys/time.h> issues, hopefully
X-Git-Tag: v7.86~6856
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=860ea57fbd4101b7532d84a0d641a3bbe538695f

fix all the <time.h> vs. <sys/time.h> issues, hopefully
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 0507894a6..55644cbad 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 573.138  2001/06/17 19:42:23  nbryant
+ fix all the <time.h> vs. <sys/time.h> issues, hopefully
+
  Revision 573.137  2001/06/07 03:28:37  ajc
  * More tweaks to the MIME parser
 
@@ -2538,3 +2541,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
 	* Initial CVS import 
+
diff --git a/citadel/aidepost.c b/citadel/aidepost.c
index 81fbe7784..0ed777b66 100644
--- a/citadel/aidepost.c
+++ b/citadel/aidepost.c
@@ -7,7 +7,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include <errno.h>
 #include <string.h>
diff --git a/citadel/citadel.c b/citadel/citadel.c
index be9806d3a..c25589047 100644
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -11,7 +11,18 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/citadel/citserver.c b/citadel/citserver.c
index c39c817ee..919156a6a 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -11,7 +11,18 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
@@ -21,7 +32,6 @@
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "citadel.h"
diff --git a/citadel/client_chat.c b/citadel/client_chat.c
index c30cd6699..49418a5d2 100644
--- a/citadel/client_chat.c
+++ b/citadel/client_chat.c
@@ -15,7 +15,18 @@
 #include <string.h>
 #include <signal.h>
 #include <errno.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
diff --git a/citadel/commands.c b/citadel/commands.c
index c9eca3ac7..f10b1aa21 100644
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -14,7 +14,17 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
diff --git a/citadel/control.c b/citadel/control.c
index dd056611b..5a154b14f 100644
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -11,7 +11,18 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
diff --git a/citadel/database.c b/citadel/database.c
index 79ed9014a..dc247df97 100644
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -19,7 +19,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 7f7da3d5e..38fa138b6 100644
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -14,7 +14,18 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
diff --git a/citadel/genstamp.c b/citadel/genstamp.c
index 1ca2752cd..627ffc19c 100644
--- a/citadel/genstamp.c
+++ b/citadel/genstamp.c
@@ -9,7 +9,18 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include "genstamp.h"
 
 
diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 1f2fc70f3..2746b68de 100644
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -10,13 +10,23 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
diff --git a/citadel/html.c b/citadel/html.c
index 323fa0523..29ee1a8ed 100644
--- a/citadel/html.c
+++ b/citadel/html.c
@@ -10,7 +10,18 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index 011119d3a..8b73dacf8 100644
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -16,14 +16,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/imap_misc.c b/citadel/imap_misc.c
index 075ce9e1c..add72d2fb 100644
--- a/citadel/imap_misc.c
+++ b/citadel/imap_misc.c
@@ -14,14 +14,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/imap_search.c b/citadel/imap_search.c
index fc40923ab..c55ba28c6 100644
--- a/citadel/imap_search.c
+++ b/citadel/imap_search.c
@@ -16,14 +16,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/imap_store.c b/citadel/imap_store.c
index 171b1f26c..ec2de6f4f 100644
--- a/citadel/imap_store.c
+++ b/citadel/imap_store.c
@@ -15,14 +15,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 182fa023c..4180874c3 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -15,13 +15,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/internetmail.c b/citadel/internetmail.c
index 861aeb5c2..c2aba231d 100644
--- a/citadel/internetmail.c
+++ b/citadel/internetmail.c
@@ -10,7 +10,18 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <string.h>
 #include <ctype.h>
 #include <syslog.h>
diff --git a/citadel/logging.c b/citadel/logging.c
index af9b57031..5ec154cb3 100644
--- a/citadel/logging.c
+++ b/citadel/logging.c
@@ -11,7 +11,18 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
diff --git a/citadel/messages.c b/citadel/messages.c
index 1cd168ad5..6167a8378 100644
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -18,7 +18,18 @@
 #include <limits.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <stdarg.h>
 #include "citadel.h"
 #include "messages.h"
diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 9123604de..12afea81e 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -10,7 +10,18 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <syslog.h>
diff --git a/citadel/msgform.c b/citadel/msgform.c
index e4f80b666..f24bf8801 100644
--- a/citadel/msgform.c
+++ b/citadel/msgform.c
@@ -18,7 +18,18 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <errno.h>
 
 
diff --git a/citadel/netmailer.c b/citadel/netmailer.c
index 874e21761..69309c511 100644
--- a/citadel/netmailer.c
+++ b/citadel/netmailer.c
@@ -8,7 +8,18 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
diff --git a/citadel/netproc.c b/citadel/netproc.c
index 6a8877681..7645f4f8f 100644
--- a/citadel/netproc.c
+++ b/citadel/netproc.c
@@ -34,7 +34,18 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <signal.h>
 #include <errno.h>
 #include <syslog.h>
diff --git a/citadel/parsedate.y b/citadel/parsedate.y
index 22ab722b6..b710129c0 100644
--- a/citadel/parsedate.y
+++ b/citadel/parsedate.y
@@ -22,7 +22,18 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <ctype.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include "parsedate.h"
 
 int date_lex(void);
diff --git a/citadel/policy.c b/citadel/policy.c
index 7c51fd0b6..076fe8bcd 100644
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -10,7 +10,18 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
diff --git a/citadel/rcit.c b/citadel/rcit.c
index c594d6c97..c34b07693 100644
--- a/citadel/rcit.c
+++ b/citadel/rcit.c
@@ -18,7 +18,18 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include "citadel.h"
 
 void get_config(void);
diff --git a/citadel/readlog.c b/citadel/readlog.c
index 4a221b4d8..b11dbf46c 100644
--- a/citadel/readlog.c
+++ b/citadel/readlog.c
@@ -8,7 +8,18 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <string.h>
 #include <errno.h>
 #include "citadel.h"
diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 923d6d760..4ba90922c 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -10,7 +10,18 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include <errno.h>
 #include "citadel.h"
diff --git a/citadel/routines.c b/citadel/routines.c
index 2769a5b5d..6f3cd2106 100644
--- a/citadel/routines.c
+++ b/citadel/routines.c
@@ -18,7 +18,18 @@
 #include <signal.h>
 #include <dirent.h>
 #include <errno.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #ifdef HAVE_UTMP_H
 #include <utmp.h>
diff --git a/citadel/routines2.c b/citadel/routines2.c
index 96e77cdeb..021144941 100644
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -14,7 +14,18 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <signal.h>
 #include <pwd.h>
 #include <setjmp.h>
diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 3a04baeaf..8c7f63e53 100644
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -14,7 +14,18 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <signal.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/citadel/serv_bio.c b/citadel/serv_bio.c
index 18bf3b920..7915bbfb5 100644
--- a/citadel/serv_bio.c
+++ b/citadel/serv_bio.c
@@ -15,13 +15,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index f45c3f217..c59c62d94 100644
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -14,10 +14,18 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
 #endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
diff --git a/citadel/serv_expire.c b/citadel/serv_expire.c
index 857e69dea..149ad0e6c 100644
--- a/citadel/serv_expire.c
+++ b/citadel/serv_expire.c
@@ -34,14 +34,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
 #include <syslog.h>
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index f78984deb..b51141b39 100644
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -24,14 +24,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_inetcfg.c b/citadel/serv_inetcfg.c
index 922841bbe..c9dbd2d7a 100644
--- a/citadel/serv_inetcfg.c
+++ b/citadel/serv_inetcfg.c
@@ -17,13 +17,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_info.c b/citadel/serv_info.c
index 48c701022..02915751c 100644
--- a/citadel/serv_info.c
+++ b/citadel/serv_info.c
@@ -9,7 +9,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
diff --git a/citadel/serv_moderate.c b/citadel/serv_moderate.c
index 867584a06..18fc11af9 100644
--- a/citadel/serv_moderate.c
+++ b/citadel/serv_moderate.c
@@ -14,13 +14,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 9f7382bb2..980160f32 100644
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -16,13 +16,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_pas2.c b/citadel/serv_pas2.c
index 9c561bd2a..8ed5dccd9 100644
--- a/citadel/serv_pas2.c
+++ b/citadel/serv_pas2.c
@@ -6,7 +6,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index 0b4c4a674..0906e8371 100644
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -31,14 +31,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_rwho.c b/citadel/serv_rwho.c
index ebd2adbb7..582e1fd5b 100644
--- a/citadel/serv_rwho.c
+++ b/citadel/serv_rwho.c
@@ -15,13 +15,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index ddbe9398c..55d81f57b 100644
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -15,12 +15,22 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
-#include <time.h>
 #include "citadel.h"
 #include "server.h"
 #include "sysdep_decls.h"
diff --git a/citadel/serv_test.c b/citadel/serv_test.c
index 3ab8af95b..8c2bb1917 100644
--- a/citadel/serv_test.c
+++ b/citadel/serv_test.c
@@ -14,13 +14,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index 51d0e430f..17730bd35 100644
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -14,13 +14,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index 20c3f96c6..bc54ced0f 100644
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -14,14 +14,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 07d93c6f7..2a67d9f87 100644
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -17,13 +17,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
diff --git a/citadel/stats.c b/citadel/stats.c
index c940c054d..9ed10c33e 100644
--- a/citadel/stats.c
+++ b/citadel/stats.c
@@ -8,7 +8,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 51439c3ce..ee995dd21 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -24,7 +24,18 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include <netinet/in.h>
 #include <netdb.h>
diff --git a/citadel/tools.c b/citadel/tools.c
index 2c0063a34..3260e87d0 100644
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -10,7 +10,18 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include "tools.h"
 #include "citadel.h"
 
diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index ec7888c27..ce4b0b33e 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -15,7 +15,18 @@
 #include <pwd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <string.h>
 #include <syslog.h>
 #include <limits.h>
diff --git a/citadel/userlist.c b/citadel/userlist.c
index 5354722a7..bd59f04a5 100644
--- a/citadel/userlist.c
+++ b/citadel/userlist.c
@@ -9,7 +9,18 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include "citadel.h"
 #include <unistd.h>
 #include "ipc.h"
diff --git a/citadel/vcard.c b/citadel/vcard.c
index 2ecc16824..e9c06f321 100644
--- a/citadel/vcard.c
+++ b/citadel/vcard.c
@@ -15,7 +15,18 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>