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

[citadel.git] / citadel / readlog.c

diff --git a/citadel/readlog.c b/citadel/readlog.c
index 1964f9dc386a404fb46f4f42f020f398035939e4..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"
@@ -21,9 +32,9 @@ main (int argc, char **argv)
 {
   time_t LogTime;
   unsigned int LogType;
-  char LogName[256];
+  char LogName[SIZ];
 
-  char buf[256];
+  char buf[SIZ];
   char aaa[100];
   struct tm *tm;
   char *tstring;
@@ -39,7 +50,7 @@ main (int argc, char **argv)
     }
   else
     {
-      while (fgets (buf, 256, logfp) != NULL)
+      while (fgets (buf, sizeof buf, logfp) != NULL)
        {
          buf[strlen (buf) - 1] = 0;
          strcat(buf, " ");