Completely remove the use of TIME_WITH_SYS_TIME (I removed the autoconf

test but never removed the code, and this caused some problems on systems
that needed some prototypes in <time.h>).

diff --git a/sbr/dtimep.lex b/sbr/dtimep.lex
index 01910868f37f60f2a4a532559a4ff4b301e01baf..29c4dd0c21d4f7aa11eaf9d7aa7504e6f39900cb 100644 (file)
--- a/sbr/dtimep.lex
+++ b/sbr/dtimep.lex
@@ -160,16 +160,10 @@ static int day_map[] = {
                        --cp; }
 
 #ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
-# ifdef TIME_WITH_SYS_TIME
+# ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
-#  include <time.h>
-# else
-#  ifdef HAVE_SYS_TIME_H
-#   include <sys/time.h>
-#  else
-#   include <time.h>
-#  endif
 # endif
+#include <time.h>
 
 static void
 zonehack (struct tws *tw)

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index a180c561a403f0280d8b7eb8492912c10afdf32b..a86661e925019e8b60b9fb7628942f97ad743987 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -13,16 +13,10 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 /*
  * hash table for deciding if a component is "interesting"

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 8d0383608c03053b66e24d615526d791de6c259e..97849198a13cc40e8253b088e47f43eb19195a4f 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -13,16 +13,10 @@
 #include <h/tws.h>
 #include <h/fmt_compile.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 #ifdef MULTIBYTE_SUPPORT
 #  include <wctype.h>
 #  include <wchar.h>

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index c4353b59a3f2997af857ff413a22fde92253811e..c7dffcfc0602f36386dd1a0ed01542b2691ab6fb 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -19,16 +19,10 @@
 #include <h/signals.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 #include <errno.h>
 
 #ifdef HAVE_FCNTL_H

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index ea2bcd684da3808901760f7d6af5f7d918713058..2a3f8996958826121cb1ba349a05c37645579e27 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -27,16 +27,10 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 
 extern int debugsw;

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 807cf600972e66ed546117f94e50e2d021d8c6b8..cf9087b22522984441d1d595457c67a932b318c5 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -21,16 +21,10 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 extern int debugsw;
 

diff --git a/uip/picksbr.c b/uip/picksbr.c
index bd4c263e614d9f1566ccb567a354f00034ff0a53..4afd0941e9029a836ac1c393838ae7bc93ad5856 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -12,16 +12,10 @@
 #include <h/picksbr.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 static struct swit parswit[] = {
 #define        PRAND                   0

diff --git a/uip/post.c b/uip/post.c
index 6429cb4a14cf87b52e582b7cba2f3f67a0cb5979..515e1d5ab2426c70ea7281c574748cd0bdfdb527 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -23,16 +23,10 @@
 #include <setjmp.h>
 #include <signal.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 #ifdef SMTPMTS
 # include <mts/smtp/smtp.h>

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index f0c84f5e977bb1ae1c2c4e5f3ad57cb9d4921667..6215219ec0c9a995d7135261aa13ffff2676eb44 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -16,16 +16,10 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 int debugsw = 0;               /* global */
 int forwsw  = 1;