From b125f9998b3b28ac22b7878c2a2c6fae8cb16555 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Tue, 12 Oct 2004 22:00:28 +0000
Subject: Remainder of 2003-11-07-6.2.5-shetye-bugfixes.diff: Fix sys/time.h
 and time.h handling. See
 http://funknet.net/fetchmail/patches/2003-11-07-6.2.5-shetye-bugfixes.diff

svn path=/trunk/; revision=3940
---
 driver.c    |  1 -
 fetchmail.h | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/driver.c b/driver.c
index 1e27943d..b9a52e9f 100644
--- a/driver.c
+++ b/driver.c
@@ -23,7 +23,6 @@
 #if defined(HAVE_SYS_ITIMER_H)
 #include <sys/itimer.h>
 #endif
-#include  <sys/time.h>
 #include  <signal.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
diff --git a/fetchmail.h b/fetchmail.h
index 146b1712..b47d6293 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -22,6 +22,18 @@
 
 #include <stdio.h>
 
+/* We need this for time_t */
+#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
+
 /* constants designating the various supported protocols */
 #define		P_AUTO		1
 #define		P_POP2		2
-- 
cgit v1.2.3