From b3628819b4ab903269cd83cc68e453b13534346c Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Tue, 27 Mar 2012 09:10:44 +0200
Subject: [PATCH] Completely remove the use of TIME_WITH_SYS_TIME. Removed the
 autoconf test but never removed the code, and this caused
 some problems on systems that needed some prototypes in
 <time.h>.

Pulled in from nmh. Thanks to Ken Hornstein.
---
 sbr/dtimep.lex    |   11 ++---------
 sbr/fmt_compile.c |   10 ++--------
 sbr/fmt_scan.c    |   11 +++--------
 sbr/lock_file.c   |   10 ++--------
 uip/mhbuild.c     |   10 ++--------
 uip/mhcachesbr.c  |   10 ++--------
 uip/pick.c        |   10 ++--------
 uip/send.c        |   10 ++--------
 8 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/sbr/dtimep.lex b/sbr/dtimep.lex
index b5fac4f..133a9ab 100644
--- a/sbr/dtimep.lex
+++ b/sbr/dtimep.lex
@@ -10,7 +10,6 @@
 %{
 #include <h/nmh.h>
 #include <h/tws.h>
-#include <time.h>
 
   /* Since we're looking at a string at a time, don't worry about
    *  wrapping to the next buffer.
@@ -144,16 +143,10 @@ static int day_map[] = {
 #define SKIPTOSP()  { while ( !isspace(*cp++) ) ; --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 797c192..c49a6ea 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -12,16 +12,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 f26b02b..f727177 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -12,16 +12,11 @@
 #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 5d0be84..d15c939 100644
--- 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>
 
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 06a353a..739aa46 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -25,16 +25,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>
 
 static struct swit switches[] = {
 #define CHECKSW  0
diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 2d6c596..201ce51 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -19,16 +19,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/pick.c b/uip/pick.c
index 73babad..896c37b 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -10,16 +10,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>
 
 static struct swit switches[] = {
 #define ANDSW  0
diff --git a/uip/send.c b/uip/send.c
index e39ab80..a2e9932 100644
--- a/uip/send.c
+++ b/uip/send.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;
-- 
1.7.10.4