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

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 0507894a6047a7210e3114667452ac1c34b80798..55644cbad47a68375e070b9e33b05506747884a5 100644 (file)
--- 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 81fbe7784328ba00395118745f36c518d3591777..0ed777b66f457ef428de76c2a86f84248f69eca7 100644 (file)
--- 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 be9806d3acad626f0d3299beb965df496e0900b6..c25589047694e30ff86fb3b7730898034dc13339 100644 (file)
--- 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 c39c817eed4ca9924c6b2c56e1e1859537b1ada2..919156a6a4da8cf039cca909439df48b3b45809c 100644 (file)
--- 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 c30cd66994b54b163883f67e41a7d34cda0bd898..49418a5d26bc190b93e0b1c58d89155b052c1065 100644 (file)
--- 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 c9eca3ac78bc78c873b3c485e5198895747d22c8..f10b1aa213a4119b653503c1b509fbe93e1ecb33 100644 (file)
--- 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 dd056611ba1c24064a0c991a4156db6cb6c26375..5a154b14f2c9f3d5a94f7126df9a6475312967a2 100644 (file)
--- 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 79ed9014a187ce5fe3bef932ccafd35670825b73..dc247df978a194ad2c98af31403a0e7013d942ce 100644 (file)
--- 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 7f7da3d5eabd20fc95b7d0788783ac164d3226d2..38fa138b6a855130fc1ab60c0f7de16b85f14f01 100644 (file)
--- 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 1ca2752cd6f2d4527dee237807137cfed3cb9a2c..627ffc19cf31aaf31f7e75179b9ef4c322378725 100644 (file)
--- 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 1f2fc70f36e3d0cc40f85e505c23df6ccfba9d84..2746b68de55126a7e4551c8f5f7e2e8bdd1c7b5a 100644 (file)
--- 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 323fa0523023bee62b25cc303058b6bc1e43264e..29ee1a8ed51f33f079eb51ed2c74588efedabe9b 100644 (file)
--- 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 011119d3aca25d5e0b6b4e0cf7cc27ee2a306178..8b73dacf89d5b3481afff91af917b0b4d4d2aba9 100644 (file)
--- 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 075ce9e1cd758a3f729f6b4605bd60ce35499f27..add72d2fb87c2ae9763ea54d57b3aaeeca3e425f 100644 (file)
--- 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 fc40923abb200a753887c7bbc426a5ec28a6add2..c55ba28c69098bb65f53a53c8f31d5a15770db05 100644 (file)
--- 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 171b1f26cd2dcec8301beaa296315f8c52ca9fe8..ec2de6f4f600f4836002f40c9cd9ad9ef3f2de38 100644 (file)
--- 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 182fa023c7ff53d7dbdc7f6e36756932bcb5679a..4180874c3b82d09454d60c6f76422366c31ba4f7 100644 (file)
--- 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 861aeb5c2bd194cd5f6ed703c6253b0f7bf981ed..c2aba231d83a60b7ccca6cdb2bbb12e27c48ef4e 100644 (file)
--- 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 af9b5703124ad9d918e514955b655a9091e3dbba..5ec154cb370cd8ff2b4b540e3b020fccf713788f 100644 (file)
--- 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 1cd168ad59d9616765f0500d0c838da67684dd7c..6167a8378dd96d97cd8963d372d1ed5a8e621cf8 100644 (file)
--- 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 9123604de58343153735893f37f783499e54e164..12afea81e35edda7671b9ca2ab8e9caf8624833a 100644 (file)
--- 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 e4f80b6665cfdfd7ac61996d4a261be516b7f630..f24bf8801b5ad5759da027f8845cd23511dbfabb 100644 (file)
--- 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 874e21761078c0429504dabbcc81e232a893faed..69309c5118c19e5c5e8f9cef1c9af169accd370d 100644 (file)
--- 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 6a887768145540ce268a6f116a74c37ad3238203..7645f4f8f41fa1fa299d526abec9bfd4b59ea334 100644 (file)
--- 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 22ab722b6edf56673c60f078820132f7acbf4b5d..b710129c04f9434a3fc909924458502358e8ad6f 100644 (file)
--- 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 7c51fd0b6da65b37b3a1e1a2cdb465e79e8d7a90..076fe8bcd8141358cf70ad6072a63861bf90dd2a 100644 (file)
--- 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 c594d6c973cb7de9b8cbf6cff1643337c8909651..c34b0769343fb8e02ed4d740ac6de1a02c773717 100644 (file)
--- 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 4a221b4d8649d02314ae2faa8fe29a017d9c7fe4..b11dbf46c902f0b3f3bfe38509b5e01b9bb4fb0e 100644 (file)
--- 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 923d6d760fe33564bc6d28bc6b5d319c5d2acdc6..4ba90922c19d2528fade3063a2af1ab511688c74 100644 (file)
--- 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 2769a5b5d92e45a90f626576bc6b9f0dfbe56616..6f3cd2106b62dbf391fb2b161238b540025d284c 100644 (file)
--- 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 96e77cdebdf87135035d2707cd2790a698ab2be0..0211449415c69fe7105cf24943222a57a219c678 100644 (file)
--- 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 3a04baeaf8ef4dffe43cfa8a0933af117f98c4ec..8c7f63e5307970636a03d19cb7872891e4c9764c 100644 (file)
--- 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 18bf3b920db98fed23477d640eb58b89036d593d..7915bbfb5d367f255b7ddd0487a08e1057ec1963 100644 (file)
--- 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 f45c3f217e875ffc2ee17b7cb41abe4dafdbdd3b..c59c62d94b1399f14cb30d9ed6960c4ddbb5d166 100644 (file)
--- 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 857e69deaffccd4d144cbba58195c6f91850a73e..149ad0e6cfaf9b378daa16dd78ca4baf6ef0d719 100644 (file)
--- 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 f78984deb3bb477d99b62c1ad6cca651dd446c64..b51141b393959aadffa862a6ed36afa8cbb0718c 100644 (file)
--- 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 922841bbe8ed4d6b149e4973f6e5927bc6ea52a9..c9dbd2d7af5ba9f7e9e8d54468bed59b70dec240 100644 (file)
--- 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 48c701022e621bf98b85bf0c100b6a6db42874b7..02915751c9e2251d998c8574b04399f0872516e7 100644 (file)
--- 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 867584a0683e22c9e0daaa36fab9ef977aacd2ac..18fc11af9dbc86a426ee30c2b43b07a2fbe0277e 100644 (file)
--- 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 9f7382bb25c00245ef0599a9829639f482fcdf32..980160f32bdae55f623c8c61ad02dde3bb194d61 100644 (file)
--- 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 9c561bd2af6665bc179674bb38537d85dcf9d961..8ed5dccd91559811f863f829002795b22a4df4a6 100644 (file)
--- 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 0b4c4a674db14aef4589e212ce471cfa17b3ed38..0906e837113827fa5159c4d85ac2d81a92b65640 100644 (file)
--- 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 ebd2adbb7af131213a2eeb35379205bdfe9c590b..582e1fd5b25c57affae687bac550a7fae02f469d 100644 (file)
--- 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 ddbe9398cdb1e9cdd4ebe3b61bb440f77b7da2c5..55d81f57b3d45d3a897f466e21fe8a060c4d7c0d 100644 (file)
--- 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 3ab8af95bc433a0d16353b3edf9cdf9a3ccb5e47..8c2bb19172b01bdef064436b49aae4200a386542 100644 (file)
--- 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 51d0e430f25baa4093cc18945c745627d15798c1..17730bd3595735ab424ce9b8f386e11db0ceae57 100644 (file)
--- 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 20c3f96c62b7ba1a42db4c876150faccbaa5b7e9..bc54ced0fd159076fe49afd938bad97a324d8ddd 100644 (file)
--- 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 07d93c6f7e555c774508fed06aea38c0746599df..2a67d9f874002ca7440d3aac49df3a785262e3bf 100644 (file)
--- 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 c940c054d1b58de1a6571853fdacfb85fc60b336..9ed10c33e58ebaff8759ddc9a7f656b9cbc6ca6a 100644 (file)
--- 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 51439c3ce862c98339334b1ac4f32ebc119d0829..ee995dd2198e1403221bc917af52a8a9ae09f210 100644 (file)
--- 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 2c0063a3485d9a95cf1b86fb99b16d8f34521c8c..3260e87d0de639197fa31925dada7c370c90372b 100644 (file)
--- 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 ec7888c278dcaf9e329e05b8ffbdf7db57d05db9..ce4b0b33e4ed0657ea0627b4164c7f5ba45a0d88 100644 (file)
--- 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 5354722a7728c3604023e1fe9b67565e26ae0995..bd59f04a582cf1f4cef04f742065eafa7740339a 100644 (file)
--- 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 2ecc16824a0e20e07af1f222d3f4c4890ff6b3df..e9c06f3219f4ed6b58a57932022eb5cafb627d7a 100644 (file)
--- 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>