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

[citadel.git] / citadel / routines2.c

diff --git a/citadel/routines2.c b/citadel/routines2.c
index 114fbd08f691f3f04cec6c3bee192ba2083c5eab..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>
@@ -673,7 +684,7 @@ void do_system_configuration(void)
        strprompt("Geographic location of this system", &sc[12][0], 31);
        strprompt("Name of system administrator", &sc[13][0], 25);
        strprompt("Paginator prompt", &sc[10][0], 79);
-       strprompt("Default moderation filter for new users", &sc[25][0], 4);
+       /* strprompt("Default moderation filter for new users", &sc[25][0], 4); */
 
        /* Security parameters */