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

[citadel.git] / citadel / serv_inetcfg.c

diff --git a/citadel/serv_inetcfg.c b/citadel/serv_inetcfg.c
index 0f737910c8cff56d45fc3ceca62f42c83788f5f5..c9dbd2d7af5ba9f7e9e8d54468bed59b70dec240 100644 (file)
--- a/citadel/serv_inetcfg.c
+++ b/citadel/serv_inetcfg.c
@@ -1,9 +1,11 @@
-/* $Id$ 
+/*
+ * $Id$ 
  *
  * This module handles the loading/saving and maintenance of the
  * system's Internet configuration.  It's not an optional component; I
  * wrote it as a module merely to keep things as clean and loosely coupled
  * as possible.
+ *
  */
 
 #include "sysdep.h"
@@ -15,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"
@@ -39,7 +51,7 @@
 
 void inetcfg_setTo(struct CtdlMessage *msg) {
        char *conf;
-       char buf[256];
+       char buf[SIZ];
 
        if (msg->cm_fields['M']==NULL) return;
        conf = strdoop(msg->cm_fields['M']);
@@ -92,7 +104,7 @@ int inetcfg_aftersave(struct CtdlMessage *msg) {
 }
 
 
-void inetcfg_init_backend(long msgnum) {
+void inetcfg_init_backend(long msgnum, void *userdata) {
        struct CtdlMessage *msg;
 
                msg = CtdlFetchMessage(msgnum);
@@ -106,7 +118,7 @@ void inetcfg_init_backend(long msgnum) {
 void inetcfg_init(void) {
        if (getroom(&CC->quickroom, SYSCONFIGROOM) != 0) return;
        CtdlForEachMessage(MSGS_LAST, 1, (-127), INTERNETCFG, NULL,
-               inetcfg_init_backend);
+               inetcfg_init_backend, NULL);
 }