From 2c3d90ed127ab47e695350367ca3c34d4324bcc4 Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Wed, 11 Jan 2012 15:04:39 -0500 Subject: [PATCH] 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 ). --- sbr/dtimep.lex | 10 ++-------- sbr/fmt_compile.c | 10 ++-------- sbr/fmt_scan.c | 10 ++-------- sbr/lock_file.c | 10 ++-------- uip/mhbuildsbr.c | 10 ++-------- uip/mhcachesbr.c | 10 ++-------- uip/picksbr.c | 10 ++-------- uip/post.c | 10 ++-------- uip/sendsbr.c | 10 ++-------- 9 files changed, 18 insertions(+), 72 deletions(-) diff --git a/sbr/dtimep.lex b/sbr/dtimep.lex index 0191086..29c4dd0 100644 --- 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 -# include -# else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif # endif +#include static void zonehack (struct tws *tw) diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index a180c56..a86661e 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -13,16 +13,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include /* * hash table for deciding if a component is "interesting" diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index 8d03836..9784919 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -13,16 +13,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include #ifdef MULTIBYTE_SUPPORT # include # include diff --git a/sbr/lock_file.c b/sbr/lock_file.c index c4353b5..c7dffcf 100644 --- a/sbr/lock_file.c +++ b/sbr/lock_file.c @@ -19,16 +19,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include #include #ifdef HAVE_FCNTL_H diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index ea2bcd6..2a3f899 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -27,16 +27,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include extern int debugsw; diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c index 807cf60..cf9087b 100644 --- a/uip/mhcachesbr.c +++ b/uip/mhcachesbr.c @@ -21,16 +21,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include extern int debugsw; diff --git a/uip/picksbr.c b/uip/picksbr.c index bd4c263..4afd094 100644 --- a/uip/picksbr.c +++ b/uip/picksbr.c @@ -12,16 +12,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include static struct swit parswit[] = { #define PRAND 0 diff --git a/uip/post.c b/uip/post.c index 6429cb4..515e1d5 100644 --- a/uip/post.c +++ b/uip/post.c @@ -23,16 +23,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include #ifdef SMTPMTS # include diff --git a/uip/sendsbr.c b/uip/sendsbr.c index f0c84f5..6215219 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -16,16 +16,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include int debugsw = 0; /* global */ int forwsw = 1; -- 1.7.10.4