From 6063a3b5bd45f8d65aaec1e01cfe40177aa79c34 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Mon, 25 Apr 2005 16:50:47 +0000
Subject: Merge SuSE's fetchmail-6.2.5-implicit-declaration.patch

svn path=/trunk/; revision=4036
---
 NEWS        |  1 +
 fetchmail.c |  4 ++++
 socket.c    | 11 +++++++++++
 3 files changed, 16 insertions(+)

diff --git a/NEWS b/NEWS
index 49d8c701..cf43cefd 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@
   OLDNEWS file. (Matthias Andree)
 * Merge SuSE patches: (sent by Stanislav Brabec, merged by Matthias Andree)
   - fetchmail-6.2.5-declaration.patch (double sigint_handler decl)
+  - fetchmail-6.2.5-implicit-declaration.patch (missing #include)
 
 fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines:
 
diff --git a/fetchmail.c b/fetchmail.c
index 7bc6d4ea..1398a688 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -30,6 +30,10 @@
 #endif /* HAVE_SETRLIMIT */
 #include <sys/utsname.h>
 
+#ifdef HAVE_SOCKS
+#include <socks.h> /* SOCKSinit() */
+#endif /* HAVE_SOCKS */
+
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
diff --git a/socket.c b/socket.c
index 50a48a81..d6c47adf 100644
--- a/socket.c
+++ b/socket.c
@@ -37,6 +37,17 @@
 #else
 #include <varargs.h>
 #endif
+#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
+
 #include "socket.h"
 #include "fetchmail.h"
 #include "i18n.h"
-- 
cgit v1.2.3