Use the "timewrap.h" wrapper instead of including <time.h> and/or

<sys/time.h> directly.

src/server/admin.c

 /*
- * $Id: admin.c,v 0.53 2003/01/12 19:56:25 ceder Exp $
+ * $Id: admin.c,v 0.54 2003/07/12 22:26:31 ceder Exp $
  * Copyright (C) 1991, 1993-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <setjmp.h>
 #include <sys/types.h>
-#include <time.h>
+#include "timewrap.h"
 #include <malloc.h>
 #include <signal.h>
 

src/server/aux-items.c

 /*
- * $Id: aux-items.c,v 1.49 2003/07/12 21:28:58 ceder Exp $
+ * $Id: aux-items.c,v 1.50 2003/07/12 22:26:31 ceder Exp $
  * Copyright (C) 1994-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -37,6 +37,7 @@
 #endif
 #include <setjmp.h>
 #include <assert.h>
+#include "timewrap.h"
 
 #include "aux.h"
 #include "kom-types.h"

src/server/conf-file.c

 /*
- * $Id: conf-file.c,v 1.27 2003/07/12 21:29:03 ceder Exp $
+ * $Id: conf-file.c,v 1.28 2003/07/12 22:26:32 ceder Exp $
  * Copyright (C) 1994-1995, 1998-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -34,7 +34,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <time.h>
+#include "timewrap.h"
 #include <assert.h>
 #include <ctype.h>
 #ifdef HAVE_STRING_H

src/server/conference.c

 /*
- * $Id: conference.c,v 0.78 2003/07/12 21:29:07 ceder Exp $
+ * $Id: conference.c,v 0.79 2003/07/12 22:26:32 ceder Exp $
  * Copyright (C) 1991-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -35,7 +35,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#include <time.h>
+#include "timewrap.h"
 #include <setjmp.h>
 #include <sys/types.h>
 

src/server/connections.c

 /*
- * $Id: connections.c,v 0.96 2003/07/12 21:29:22 ceder Exp $
+ * $Id: connections.c,v 0.97 2003/07/12 22:26:32 ceder Exp $
  * Copyright (C) 1991-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -43,16 +43,7 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef TIME_WITH_SYS_TIME
-#  include <sys/time.h>
-#  include <time.h>
-#else
-#  ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#  else
-#    include <time.h>
-#  endif
-#endif
+#include "timewrap.h"
 #include <sys/socket.h>
 #include <signal.h>
 #include <assert.h>

src/server/dbck-cache.c

 /*
- * $Id: dbck-cache.c,v 0.52 2002/10/31 09:31:00 ceder Exp $
+ * $Id: dbck-cache.c,v 0.53 2003/07/12 22:26:32 ceder Exp $
  * Copyright (C) 1991-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -51,7 +51,7 @@
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
-#include <time.h>
+#include "timewrap.h"
 #include <sys/types.h>
 #ifdef TIME_SYNC
 #  include <sys/resource.h>

src/server/dbck.c

 /*
- * $Id: dbck.c,v 0.72 2003/01/12 19:56:23 ceder Exp $
+ * $Id: dbck.c,v 0.73 2003/07/12 22:26:32 ceder Exp $
  * Copyright (C) 1991-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -40,7 +40,7 @@
 #ifdef HAVE_STDARG_H
 #  include <stdarg.h>
 #endif
-#include <time.h>
+#include "timewrap.h"
 #include <sys/types.h>
 #ifdef HAVE_CRYPT_H
 #  include <crypt.h>

src/server/disk-end-of-atomic.c

 /*
- * $Id: disk-end-of-atomic.c,v 0.26 2003/07/12 21:29:25 ceder Exp $
+ * $Id: disk-end-of-atomic.c,v 0.27 2003/07/12 22:26:32 ceder Exp $
  * Copyright (C) 1991-1994, 1998-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -45,6 +45,7 @@
 #  include <stddef.h>
 #endif
 #include <sys/types.h>
+#include "timewrap.h"
 
 #include "misc-types.h"
 #include "s-string.h"

src/server/internal-connections.c

 /*
- * $Id: internal-connections.c,v 0.55 2003/07/12 21:29:28 ceder Exp $
+ * $Id: internal-connections.c,v 0.56 2003/07/12 22:26:32 ceder Exp $
  * Copyright (C) 1991-1994, 1996-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -34,7 +34,7 @@
 #endif
 
 #include <stdio.h>
-#include <time.h>
+#include "timewrap.h"
 #include <setjmp.h>
 #include <sys/types.h>
 #include <assert.h>

src/server/isc-parse.c

 /*
- * $Id: isc-parse.c,v 0.19 2003/07/12 00:18:02 ceder Exp $
+ * $Id: isc-parse.c,v 0.20 2003/07/12 22:26:32 ceder Exp $
  * Copyright (C) 1991, 1993-1994, 1996, 1998-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -42,7 +42,7 @@
 #  define strchr index
 #endif
 #include <setjmp.h>
-#include <time.h>
+#include "timewrap.h"
 #include <sys/types.h>
 
 #include "s-string.h"

src/server/komrunning.c

 /*
- * $Id: komrunning.c,v 1.6 2002/11/02 10:55:22 ceder Exp $
+ * $Id: komrunning.c,v 1.7 2003/07/12 22:26:33 ceder Exp $
  * Copyright (C) 1999, 2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -36,6 +36,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
+#include "timewrap.h"
 
 #include "kom-types.h"
 #include "s-string.h"

src/server/local-to-global.c

@@ -18,9 +18,8 @@
 #ifndef NULL
 #  include <stdio.h>
 #endif
-
 #include <sys/types.h>
-#include <time.h>
+#include "timewrap.h"
 
 #include "s-string.h"
 

src/server/lockdb.c

@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <netdb.h>
+#include "timewrap.h"
 
 #include "lockdb.h"
 #include "log.h"

src/server/log.c

 /*
- * $Id: log.c,v 0.26 2002/03/29 22:29:46 ceder Exp $
+ * $Id: log.c,v 0.27 2003/07/12 22:26:33 ceder Exp $
  * Copyright (C) 1991-1995, 1998-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -42,7 +42,7 @@
 #endif
 #include <stdio.h>
 #include <sys/types.h>
-#include <time.h>
+#include "timewrap.h"
 #include <unistd.h>
 #include <errno.h>
 

src/server/logII.c

 /*
- * $Id: logII.c,v 0.14 2002/03/29 22:38:05 ceder Exp $
+ * $Id: logII.c,v 0.15 2003/07/12 22:26:33 ceder Exp $
  * Copyright (C) 1991, 1993-1995, 1998-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -41,7 +41,7 @@
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
-#include <time.h>
+#include "timewrap.h"
 #include <unistd.h>
 
 enum 

src/server/membership.c

 /*
- * $Id: membership.c,v 0.87 2003/07/12 21:29:34 ceder Exp $
+ * $Id: membership.c,v 0.88 2003/07/12 22:26:33 ceder Exp $
  * Copyright (C) 1991-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -43,7 +43,7 @@
 #  include <string.h>
 #endif
 #include <stddef.h>
-#include <time.h>
+#include "timewrap.h"
 #include <setjmp.h>
 #include <sys/types.h>
 

src/server/memory.c

 /*
- * $Id: memory.c,v 0.45 2003/03/23 22:02:12 ceder Exp $
+ * $Id: memory.c,v 0.46 2003/07/12 22:26:33 ceder Exp $
  * Copyright (C) 1991-1994, 1996-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -37,7 +37,7 @@
 #  include <string.h>
 #endif
 #include <sys/types.h>
-#include <time.h>
+#include "timewrap.h"
 
 #include "s-string.h"
 #include "kom-types.h"

src/server/person.c

 /*
- * $Id: person.c,v 0.77 2003/07/12 21:29:36 ceder Exp $
+ * $Id: person.c,v 0.78 2003/07/12 22:26:33 ceder Exp $
  * Copyright (C) 1991-1999, 2001-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -42,7 +42,7 @@
 #ifdef HAVE_STRING_H
 #  include <string.h>
 #endif
-#include <time.h>
+#include "timewrap.h"
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>		/* for crypt() on Linux */
 #endif

src/server/prot-a-output.c

 /*
- * $Id: prot-a-output.c,v 0.60 2003/07/12 00:18:30 ceder Exp $
+ * $Id: prot-a-output.c,v 0.61 2003/07/12 22:26:33 ceder Exp $
  * Copyright (C) 1991-2002  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -34,7 +34,7 @@
 #  include <config.h>
 #endif
 
-#include <time.h>
+#include "timewrap.h"
 #include <setjmp.h>
 #include <sys/types.h>
 #include <sys/socket.h>

src/server/prot-a-parse-arg-c.awk

 #
-# $Id: prot-a-parse-arg-c.awk,v 0.27 2003/07/12 00:18:32 ceder Exp $
+# $Id: prot-a-parse-arg-c.awk,v 0.28 2003/07/12 22:26:34 ceder Exp $
 # Copyright (C) 1991-1994, 1996-1999, 2002  Lysator Academic Computer Association.
 #
 # This file is part of the LysKOM server.
@@ -22,7 +22,7 @@
 #
 # Please mail bug reports to bug-lyskom@lysator.liu.se. 
 #
-# $Id: prot-a-parse-arg-c.awk,v 0.27 2003/07/12 00:18:32 ceder Exp $
+# $Id: prot-a-parse-arg-c.awk,v 0.28 2003/07/12 22:26:34 ceder Exp $
 BEGIN {
     printf("/* Don't edit this file - it is generated automatically");
     printf(" from\n   prot-a-parse-arg-c.awk and fncdef.txt */\n\n");
@@ -33,7 +33,7 @@ BEGIN {
     printf("#include <sys/socket.h>\n");
     printf("#include <stdarg.h>\n");
     printf("#include <setjmp.h>\n");
-    printf("#include <time.h>\n");
+    printf("#include \"timewrap.h\"\n");
     printf("\n");
     printf("#include \"oop.h\"\n");
     printf("\n");