Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --git a/citadel/citserver.c b/citadel/citserver.c
index e5029fe51566f46a132fa598641f8a9ce6c3985f..ace58c5e713a35404bb8c42eb4daeb21d60d0cfc 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1,7 +1,7 @@
 /* 
  * Main source module for the Citadel server
  *
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2014 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -14,17 +14,7 @@
 
 #include <stdio.h>
 #include "sysdep.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 <time.h>
 #if HAVE_BACKTRACE
 #include <execinfo.h>
 #endif

diff --git a/citadel/genstamp.c b/citadel/genstamp.c
index 9c5ba5f3d6e613c3c1f15ecb2781ac3438a49bb5..668e8c052192827b1d015f03d46a6ce407d394e3 100644 (file)
--- a/citadel/genstamp.c
+++ b/citadel/genstamp.c
@@ -7,18 +7,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.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 <time.h>
 #include "genstamp.h"
 
 

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 2b62fc89b31cbfc6e0a21e2b114468e1e5261bcd..7005c1c38a8df3368b7c2a1032cabaed093b8883 100644 (file)
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -26,18 +26,7 @@
 #include <errno.h>
 #include <syslog.h>
 #include <sys/types.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 <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #ifdef HAVE_STRINGS_H

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 83fcf4c04eca5a7e3c8433799ef7c84444db2d92..362d6ccf3f8fe1b65d4530c44134b273e17a3faf 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -13,18 +13,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.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 <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>

diff --git a/citadel/parsedate.c b/citadel/parsedate.c
index 74cf35563cda9122297f4d7745effdf876222af6..85440207731cf32d74a5c4cc83d42a12dcc4f7ab 100644 (file)
--- a/citadel/parsedate.c
+++ b/citadel/parsedate.c
@@ -94,18 +94,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <ctype.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 <time.h>
 #if HAVE_STRING_H
 # if !STDC_HEADERS && HAVE_MEMORY_H
 #  include <memory.h>
@@ -192,7 +181,7 @@ static void         date_error(char *);
 
 
 /* Line 268 of yacc.c  */
-#line 196 "y.tab.c"
+#line 185 "y.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -249,7 +238,7 @@ typedef union YYSTYPE
 {
 
 /* Line 293 of yacc.c  */
-#line 125 "parsedate.y"
+#line 114 "parsedate.y"
 
     time_t             Number;
     enum _MERIDIAN     Meridian;
@@ -257,7 +246,7 @@ typedef union YYSTYPE
 
 
 /* Line 293 of yacc.c  */
-#line 261 "y.tab.c"
+#line 250 "y.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -269,7 +258,7 @@ typedef union YYSTYPE
 
 
 /* Line 343 of yacc.c  */
-#line 273 "y.tab.c"
+#line 262 "y.tab.c"
 
 #ifdef short
 # undef short
@@ -567,10 +556,10 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   139,   139,   140,   143,   152,   156,   159,   164,   176,
-     182,   189,   195,   205,   209,   213,   221,   227,   248,   252,
-     264,   268,   273,   277,   282,   289,   292,   295,   298,   303,
-     306
+       0,   128,   128,   129,   132,   141,   145,   148,   153,   165,
+     171,   178,   184,   194,   198,   202,   210,   216,   237,   241,
+     253,   257,   262,   266,   271,   278,   281,   284,   287,   292,
+     295
 };
 #endif
 
@@ -1523,7 +1512,7 @@ yyreduce:
         case 4:
 
 /* Line 1806 of yacc.c  */
-#line 143 "parsedate.y"
+#line 132 "parsedate.y"
     {
            yyHaveTime++;
 #ifdef lint
@@ -1538,7 +1527,7 @@ yyreduce:
   case 5:
 
 /* Line 1806 of yacc.c  */
-#line 152 "parsedate.y"
+#line 141 "parsedate.y"
     {
            yyHaveTime++;
            yyTimezone = (yyvsp[(2) - (2)].Number);
@@ -1548,7 +1537,7 @@ yyreduce:
   case 6:
 
 /* Line 1806 of yacc.c  */
-#line 156 "parsedate.y"
+#line 145 "parsedate.y"
     {
            yyHaveDate++;
        }
@@ -1557,7 +1546,7 @@ yyreduce:
   case 7:
 
 /* Line 1806 of yacc.c  */
-#line 159 "parsedate.y"
+#line 148 "parsedate.y"
     {
            yyHaveRel = 1;
        }
@@ -1566,7 +1555,7 @@ yyreduce:
   case 8:
 
 /* Line 1806 of yacc.c  */
-#line 164 "parsedate.y"
+#line 153 "parsedate.y"
     {
            if ((yyvsp[(1) - (2)].Number) < 100) {
                yyHour = (yyvsp[(1) - (2)].Number);
@@ -1584,7 +1573,7 @@ yyreduce:
   case 9:
 
 /* Line 1806 of yacc.c  */
-#line 176 "parsedate.y"
+#line 165 "parsedate.y"
     {
            yyHour = (yyvsp[(1) - (4)].Number);
            yyMinutes = (yyvsp[(3) - (4)].Number);
@@ -1596,7 +1585,7 @@ yyreduce:
   case 10:
 
 /* Line 1806 of yacc.c  */
-#line 182 "parsedate.y"
+#line 171 "parsedate.y"
     {
            yyHour = (yyvsp[(1) - (4)].Number);
            yyMinutes = (yyvsp[(3) - (4)].Number);
@@ -1609,7 +1598,7 @@ yyreduce:
   case 11:
 
 /* Line 1806 of yacc.c  */
-#line 189 "parsedate.y"
+#line 178 "parsedate.y"
     {
            yyHour = (yyvsp[(1) - (6)].Number);
            yyMinutes = (yyvsp[(3) - (6)].Number);
@@ -1621,7 +1610,7 @@ yyreduce:
   case 12:
 
 /* Line 1806 of yacc.c  */
-#line 195 "parsedate.y"
+#line 184 "parsedate.y"
     {
            yyHour = (yyvsp[(1) - (6)].Number);
            yyMinutes = (yyvsp[(3) - (6)].Number);
@@ -1635,7 +1624,7 @@ yyreduce:
   case 13:
 
 /* Line 1806 of yacc.c  */
-#line 205 "parsedate.y"
+#line 194 "parsedate.y"
     {
            (yyval.Number) = (yyvsp[(1) - (1)].Number);
            yyDSTmode = DSToff;
@@ -1645,7 +1634,7 @@ yyreduce:
   case 14:
 
 /* Line 1806 of yacc.c  */
-#line 209 "parsedate.y"
+#line 198 "parsedate.y"
     {
            (yyval.Number) = (yyvsp[(1) - (1)].Number);
            yyDSTmode = DSTon;
@@ -1655,7 +1644,7 @@ yyreduce:
   case 15:
 
 /* Line 1806 of yacc.c  */
-#line 213 "parsedate.y"
+#line 202 "parsedate.y"
     {
            /* Only allow "GMT+300" and "GMT-0800" */
            if ((yyvsp[(1) - (2)].Number) != 0) {
@@ -1669,7 +1658,7 @@ yyreduce:
   case 16:
 
 /* Line 1806 of yacc.c  */
-#line 221 "parsedate.y"
+#line 210 "parsedate.y"
     {
            (yyval.Number) = (yyvsp[(1) - (1)].Number);
            yyDSTmode = DSToff;
@@ -1679,7 +1668,7 @@ yyreduce:
   case 17:
 
 /* Line 1806 of yacc.c  */
-#line 227 "parsedate.y"
+#line 216 "parsedate.y"
     {
            int         i;
 
@@ -1704,7 +1693,7 @@ yyreduce:
   case 18:
 
 /* Line 1806 of yacc.c  */
-#line 248 "parsedate.y"
+#line 237 "parsedate.y"
     {
            yyMonth = (yyvsp[(1) - (3)].Number);
            yyDay = (yyvsp[(3) - (3)].Number);
@@ -1714,7 +1703,7 @@ yyreduce:
   case 19:
 
 /* Line 1806 of yacc.c  */
-#line 252 "parsedate.y"
+#line 241 "parsedate.y"
     {
            if ((yyvsp[(1) - (5)].Number) > 100) {
                yyYear = (yyvsp[(1) - (5)].Number);
@@ -1732,7 +1721,7 @@ yyreduce:
   case 20:
 
 /* Line 1806 of yacc.c  */
-#line 264 "parsedate.y"
+#line 253 "parsedate.y"
     {
            yyMonth = (yyvsp[(1) - (2)].Number);
            yyDay = (yyvsp[(2) - (2)].Number);
@@ -1742,7 +1731,7 @@ yyreduce:
   case 21:
 
 /* Line 1806 of yacc.c  */
-#line 268 "parsedate.y"
+#line 257 "parsedate.y"
     {
            yyMonth = (yyvsp[(1) - (4)].Number);
            yyDay = (yyvsp[(2) - (4)].Number);
@@ -1753,7 +1742,7 @@ yyreduce:
   case 22:
 
 /* Line 1806 of yacc.c  */
-#line 273 "parsedate.y"
+#line 262 "parsedate.y"
     {
            yyDay = (yyvsp[(1) - (2)].Number);
            yyMonth = (yyvsp[(2) - (2)].Number);
@@ -1763,7 +1752,7 @@ yyreduce:
   case 23:
 
 /* Line 1806 of yacc.c  */
-#line 277 "parsedate.y"
+#line 266 "parsedate.y"
     {
            yyDay = (yyvsp[(1) - (3)].Number);
            yyMonth = (yyvsp[(2) - (3)].Number);
@@ -1774,7 +1763,7 @@ yyreduce:
   case 24:
 
 /* Line 1806 of yacc.c  */
-#line 282 "parsedate.y"
+#line 271 "parsedate.y"
     {
            yyDay = (yyvsp[(3) - (5)].Number);
            yyMonth = (yyvsp[(4) - (5)].Number);
@@ -1785,7 +1774,7 @@ yyreduce:
   case 25:
 
 /* Line 1806 of yacc.c  */
-#line 289 "parsedate.y"
+#line 278 "parsedate.y"
     {
            yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
        }
@@ -1794,7 +1783,7 @@ yyreduce:
   case 26:
 
 /* Line 1806 of yacc.c  */
-#line 292 "parsedate.y"
+#line 281 "parsedate.y"
     {
            yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
        }
@@ -1803,7 +1792,7 @@ yyreduce:
   case 27:
 
 /* Line 1806 of yacc.c  */
-#line 295 "parsedate.y"
+#line 284 "parsedate.y"
     {
            yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
        }
@@ -1812,7 +1801,7 @@ yyreduce:
   case 28:
 
 /* Line 1806 of yacc.c  */
-#line 298 "parsedate.y"
+#line 287 "parsedate.y"
     {
            yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
        }
@@ -1821,7 +1810,7 @@ yyreduce:
   case 29:
 
 /* Line 1806 of yacc.c  */
-#line 303 "parsedate.y"
+#line 292 "parsedate.y"
     {
            (yyval.Meridian) = MER24;
        }
@@ -1830,7 +1819,7 @@ yyreduce:
   case 30:
 
 /* Line 1806 of yacc.c  */
-#line 306 "parsedate.y"
+#line 295 "parsedate.y"
     {
            (yyval.Meridian) = (yyvsp[(1) - (1)].Meridian);
        }
@@ -1839,7 +1828,7 @@ yyreduce:
 
 
 /* Line 1806 of yacc.c  */
-#line 1843 "y.tab.c"
+#line 1832 "y.tab.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2070,7 +2059,7 @@ yyreturn:
 
 
 /* Line 2067 of yacc.c  */
-#line 311 "parsedate.y"
+#line 300 "parsedate.y"
 
 
 /* Month and day table. */

diff --git a/citadel/parsedate.y b/citadel/parsedate.y
index 3166f310698c3140c8b1e9faac3c08ef88903c5c..d6022d365d3d22965b2411e8a4939c2a1ee56e7c 100644 (file)
--- a/citadel/parsedate.y
+++ b/citadel/parsedate.y
@@ -25,18 +25,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <ctype.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 <time.h>
 #if HAVE_STRING_H
 # if !STDC_HEADERS && HAVE_MEMORY_H
 #  include <memory.h>

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index ff624707408c15484dd1051169705489c714323c..17115df40075354d2f0490b314b5d05c78256247 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -1,7 +1,7 @@
 /*
  * citadel_dirs.c : calculate pathnames for various files used in the Citadel system
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2014 by the citadel.org team
  *
  *  This program is open source software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 3.
@@ -17,22 +17,9 @@
 #include <ctype.h>
 #include <string.h>
 #include <limits.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 <time.h>
 #include <errno.h>
 #include <libcitadel.h>
-
-
 #include "citadel.h"
 
 /* our directories... */

diff --git a/citadel/utils/msgform.c b/citadel/utils/msgform.c
index 201745a03c2e010f44713900d9362c29d635255d..909e6b8ed2b62027dc197d2b91a59b40d7e731ad 100644 (file)
--- a/citadel/utils/msgform.c
+++ b/citadel/utils/msgform.c
@@ -16,18 +16,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.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 <time.h>
 #include <errno.h>
 #include <libcitadel.h>
 
@@ -53,7 +42,7 @@ char *strerror(int e)
 int main(int argc, char **argv)
 {
        struct tm tm;
-       int a, b, e, mtype, aflag;
+       int a, b, e, aflag;
        char bbb[1024];
        char subject[1024];
        FILE *fp;
@@ -79,7 +68,7 @@ TOP:  do {
                        exit(0);
        } while (e != 255);
        strcpy(subject, "");
-       mtype = getc(fp);
+       getc(fp);
        aflag = getc(fp);
        if (qwk == 0)
                printf(" ");

diff --git a/citadel/utils/stress.c b/citadel/utils/stress.c
index 9c6d1b24d42e79728f4672824fc99b38f675332b..2655b11c9a8deb06c779c510b03c968ed91cdef2 100644 (file)
--- a/citadel/utils/stress.c
+++ b/citadel/utils/stress.c
@@ -68,16 +68,7 @@ char* const message =
 #include <string.h>
 #include <libcitadel.h>
 #include "sysdep.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 <time.h>
 #include "citadel_ipc.h"
 
 #ifndef HAVE_PTHREAD_H

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 1bdca0631d3788b7d87216ec10e77ca3e92e0500..f17cc58195f42e728c41e9680846e0a04e80d863 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -137,7 +137,7 @@ dnl AC_FUNC_VPRINTF
 AC_REPLACE_FUNCS(snprintf)
 AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])])
 
-AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h iconv.h xlocale.h)
+AC_CHECK_HEADERS(fcntl.h limits.h unistd.h iconv.h xlocale.h)
 
 dnl Checks for the zlib compression library.
 saved_CFLAGS="$CFLAGS"

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index 5f2393ff9cb95e8604504051feeeef2bca335065..420b2e71f7401da22085e7e16f9e4416e1811447 100644 (file)
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -272,8 +272,8 @@ void render_MIME_ICS_TPL(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundChar
        wc_mime_attachment *Mime = CTX(CTX_MIME_ATACH);
        icalproperty_method the_method = ICAL_METHOD_NONE;
        icalproperty *method = NULL;
-       icalcomponent *cal;
-       icalcomponent *c;
+       icalcomponent *cal = NULL;
+       icalcomponent *c = NULL;
         WCTemplputParams SubTP;
         WCTemplputParams SuperTP;
 
@@ -538,7 +538,7 @@ int cond_ICalAttendeeState(StrBuf *Target, WCTemplputParams *TP)
        for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
             (c != 0);
             c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
-               /* Recursively process subcomponent * /
+               // Recursively process subcomponent
                cal_process_object(Target, c, recursion_level+1, msgnum, cal_partnum);
        }
        */

diff --git a/webcit/static/t/aide/display_serverrestart.html b/webcit/static/t/aide/display_serverrestart.html
index 7e951d876de3cfb9ea95ec0918bc1919143aa5cb..a2c575371b7d0f30b97b692f08a775e3a30a68bb 100644 (file)
--- a/webcit/static/t/aide/display_serverrestart.html
+++ b/webcit/static/t/aide/display_serverrestart.html
@@ -3,7 +3,6 @@
 <html>
        <head>
                <title><?CURRENT_USER> - <?SERV:HUMANNODE></title>
-               <meta name="MSSmartTagsPreventParsing" content="TRUE" >
                <meta name="keywords" content="groupware messaging collaboration" >
                <link href="static/styles/webcit.css" rel="stylesheet" type="text/css">
                <link href="static/styles/datepicker.css" rel="stylesheet" type="text/css">

diff --git a/webcit/static/t/aide/display_serverrestart_page_do.html b/webcit/static/t/aide/display_serverrestart_page_do.html
index e1b4c183bd0a37cac153a98797d978206a796ca6..58cc3cb217ae54db5cc38820babf5963d6f8cd14 100644 (file)
--- a/webcit/static/t/aide/display_serverrestart_page_do.html
+++ b/webcit/static/t/aide/display_serverrestart_page_do.html
@@ -3,7 +3,6 @@
 <html>
        <head>
                <title><?CURRENT_USER> - <?SERV:HUMANNODE></title>
-               <meta name="MSSmartTagsPreventParsing" content="TRUE" >
                <meta name="keywords" content="groupware messaging collaboration" >
                <link href="static/styles/webcit.css" rel="stylesheet" type="text/css">
                <link href="static/styles/datepicker.css" rel="stylesheet" type="text/css">

diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html
index 5fdbf9ec886441c76ee97334c0465d8bdde68fc0..bb1988919da512fe3475cb511bc54b59f05bd507 100644 (file)
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -3,7 +3,6 @@
 <html>
        <head>
                <title><?THISROOM:NAME> - <?SERV:HUMANNODE></title>
-               <meta name="MSSmartTagsPreventParsing" content="TRUE" >
                <meta http-equiv="X-UA-Compatible" content="IE=8" >
                <meta name="keywords" content="groupware messaging collaboration" >
                <link href="static/styles/webcit.css" rel="stylesheet" type="text/css">

diff --git a/webcit/static/t/listsub/display.html b/webcit/static/t/listsub/display.html
index 7568681cc7bc6111ea1d33bb46b32f2fe7b96322..558a2e4688b714079750063a934acf7de5fe3198 100644 (file)
--- a/webcit/static/t/listsub/display.html
+++ b/webcit/static/t/listsub/display.html
@@ -2,7 +2,6 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-  <meta name="MSSmartTagsPreventParsing" content="TRUE" >
   <link href="/static/styles/webcit.css" rel="stylesheet" type="text/css">
   <title><?_("List subscription")></title>
 </head>

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index fb34a4cef9d04b7c748f286412cb5d539e17108e..cbfba25f955d6e5e4c4687e6d3b4868940440fb1 100644 (file)
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -25,18 +25,7 @@
 #include <sys/socket.h>
 #include <syslog.h>
 #include <sys/syslog.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 <time.h>
 #include <limits.h>
 #include <sys/resource.h>
 #include <netinet/in.h>

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 50143410cfcb68d85230d7a87e501d8e82f7adce..302c908c1031da4aaf0aedf37ffc27086f7d6e61 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -1076,7 +1076,7 @@ long end_burst(void)
 
 /*
  * lingering_close() a`la Apache. see
- * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
+ * http://httpd.apache.org/docs/2.0/misc/fin_wait_2.html for rationale
  */
 int lingering_close(int fd)
 {

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 6a8d034000d2f31449ac5c5d14e527c8a61f4624..19fe3722d921d0c46930b12afd3f8053ef73a828 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2013 by the citadel.org team
+ * Copyright (c) 1987-2014 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -25,9 +25,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #include <sys/stat.h>
 #ifdef HAVE_LIMITS_H
 #include <limits.h>