znc: add patch to add missing <time.h> inclusions

With certain toolchains, znc fails to build due to missing <time.h>
inclusions. This commit fixes that by adding a patch that adds those
missing inclusions.

Fixes:

  http://autobuild.buildroot.net/results/86e/86e5e76a6ccc1396cd84107af63cdaa0ce1dfbee/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2014-06-10 23:01:31 +02:00 committed by Peter Korsgaard
parent a39cb252dc
commit 6af371edc7

View File

@ -0,0 +1,303 @@
From 18d6daf4793fb7e9750175bd46b17fe1965b78dd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 6 May 2014 22:00:11 +0200
Subject: [PATCH] Add missing <time.h> includes
Submitted upstream at https://github.com/znc/znc/pull/569.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
modules/adminlog.cpp | 1 +
modules/awaystore.cpp | 2 ++
modules/crypt.cpp | 2 ++
modules/ctcpflood.cpp | 2 ++
modules/flooddetach.cpp | 2 ++
modules/lastseen.cpp | 2 ++
modules/log.cpp | 2 ++
modules/savebuff.cpp | 2 ++
modules/schat.cpp | 2 ++
modules/simple_away.cpp | 2 ++
src/Buffer.cpp | 2 ++
src/Csocket.cpp | 2 ++
src/FileUtils.cpp | 2 ++
src/HTTPSock.cpp | 1 +
src/IRCSock.cpp | 2 ++
src/User.cpp | 1 +
src/Utils.cpp | 2 ++
src/WebModules.cpp | 2 ++
src/ZNCDebug.cpp | 1 +
src/main.cpp | 1 +
src/znc.cpp | 2 ++
21 files changed, 37 insertions(+)
diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
index 77577b1..16dd665 100644
--- a/modules/adminlog.cpp
+++ b/modules/adminlog.cpp
@@ -20,6 +20,7 @@
#include <znc/User.h>
#include <syslog.h>
+#include <time.h>
class CAdminLogMod : public CModule {
public:
diff --git a/modules/awaystore.cpp b/modules/awaystore.cpp
index da75260..56349df 100644
--- a/modules/awaystore.cpp
+++ b/modules/awaystore.cpp
@@ -30,6 +30,8 @@
#include <znc/IRCNetwork.h>
#include <znc/FileUtils.h>
+#include <time.h>
+
using std::vector;
using std::map;
diff --git a/modules/crypt.cpp b/modules/crypt.cpp
index fcc664b..8f9018f 100644
--- a/modules/crypt.cpp
+++ b/modules/crypt.cpp
@@ -34,6 +34,8 @@
#include <znc/User.h>
#include <znc/IRCNetwork.h>
+#include <time.h>
+
#define REQUIRESSL 1
#define NICK_PREFIX_KEY "[nick-prefix]"
diff --git a/modules/ctcpflood.cpp b/modules/ctcpflood.cpp
index ac154e2..f2ce27f 100644
--- a/modules/ctcpflood.cpp
+++ b/modules/ctcpflood.cpp
@@ -17,6 +17,8 @@
#include <znc/Modules.h>
#include <znc/Chan.h>
+#include <time.h>
+
class CCtcpFloodMod : public CModule {
public:
MODCONSTRUCTOR(CCtcpFloodMod) {
diff --git a/modules/flooddetach.cpp b/modules/flooddetach.cpp
index f4ed892..0ffb651 100644
--- a/modules/flooddetach.cpp
+++ b/modules/flooddetach.cpp
@@ -17,6 +17,8 @@
#include <znc/Chan.h>
#include <znc/IRCNetwork.h>
+#include <time.h>
+
using std::map;
class CFloodDetachMod : public CModule {
diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp
index bd6eb9b..b3b209f 100644
--- a/modules/lastseen.cpp
+++ b/modules/lastseen.cpp
@@ -17,6 +17,8 @@
#include <znc/User.h>
#include <znc/znc.h>
+#include <time.h>
+
using std::map;
using std::pair;
using std::multimap;
diff --git a/modules/log.cpp b/modules/log.cpp
index 260b577..e718d76 100644
--- a/modules/log.cpp
+++ b/modules/log.cpp
@@ -21,6 +21,8 @@
#include <znc/Chan.h>
#include <znc/Server.h>
+#include <time.h>
+
using std::vector;
class CLogMod: public CModule {
diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index 8a85153..2e0ed5c 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -29,6 +29,8 @@
#include <znc/IRCNetwork.h>
#include <znc/FileUtils.h>
+#include <time.h>
+
using std::vector;
#define CRYPT_VERIFICATION_TOKEN "::__:SAVEBUFF:__::"
diff --git a/modules/schat.cpp b/modules/schat.cpp
index 98d03b4..5a7f1a0 100644
--- a/modules/schat.cpp
+++ b/modules/schat.cpp
@@ -25,6 +25,8 @@
#include <znc/User.h>
#include <znc/IRCNetwork.h>
+#include <time.h>
+
using std::pair;
using std::stringstream;
using std::map;
diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp
index a1e5927..67faeea 100644
--- a/modules/simple_away.cpp
+++ b/modules/simple_away.cpp
@@ -17,6 +17,8 @@
#include <znc/User.h>
#include <znc/IRCNetwork.h>
+#include <time.h>
+
#define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %s"
#define SIMPLE_AWAY_DEFAULT_TIME 60
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index eefbb29..55ecd72 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -17,6 +17,8 @@
#include <znc/znc.h>
#include <znc/User.h>
+#include <time.h>
+
CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval* ts) {
m_sFormat = sFormat;
m_sText = sText;
diff --git a/src/Csocket.cpp b/src/Csocket.cpp
index 2e4cb14..ca6ed38 100644
--- a/src/Csocket.cpp
+++ b/src/Csocket.cpp
@@ -53,6 +53,8 @@
#include <unicode/errorcode.h>
#endif /* HAVE_ICU */
+#include <time.h>
+
#include <list>
#define CS_SRANDBUFFER 128
diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp
index 7224a49..4c8f1d3 100644
--- a/src/FileUtils.cpp
+++ b/src/FileUtils.cpp
@@ -23,6 +23,8 @@
#include <sys/types.h>
#include <sys/wait.h>
+#include <time.h>
+
#ifndef HAVE_LSTAT
# define lstat(a, b) stat(a, b)
#endif
diff --git a/src/HTTPSock.cpp b/src/HTTPSock.cpp
index ab03130..36bf52b 100644
--- a/src/HTTPSock.cpp
+++ b/src/HTTPSock.cpp
@@ -18,6 +18,7 @@
#include <znc/znc.h>
#include <iomanip>
+#include <time.h>
#ifdef HAVE_ZLIB
#include <zlib.h>
diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index 2ef12f6..d0c56a7 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -20,6 +20,8 @@
#include <znc/IRCNetwork.h>
#include <znc/Server.h>
+#include <time.h>
+
using std::set;
using std::vector;
using std::map;
diff --git a/src/User.cpp b/src/User.cpp
index cf664f1..4a64f83 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -20,6 +20,7 @@
#include <znc/IRCNetwork.h>
#include <znc/IRCSock.h>
#include <math.h>
+#include <time.h>
using std::vector;
using std::set;
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 33c83de..e0862dd 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -26,6 +26,8 @@
#include <cstring>
#include <cstdlib>
+#include <time.h>
+
using std::map;
using std::stringstream;
using std::vector;
diff --git a/src/WebModules.cpp b/src/WebModules.cpp
index d61ba23..ddd88e0 100644
--- a/src/WebModules.cpp
+++ b/src/WebModules.cpp
@@ -22,6 +22,8 @@
#include <algorithm>
#include <sstream>
+#include <time.h>
+
using std::pair;
using std::vector;
diff --git a/src/ZNCDebug.cpp b/src/ZNCDebug.cpp
index 01d06b4..cc83298 100644
--- a/src/ZNCDebug.cpp
+++ b/src/ZNCDebug.cpp
@@ -18,6 +18,7 @@
#include <iostream>
#include <sys/time.h>
#include <stdio.h>
+#include <time.h>
bool CDebug::stdoutIsTTY = true;
bool CDebug::debug =
diff --git a/src/main.cpp b/src/main.cpp
index ac9d691..7d74f8e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,6 +16,7 @@
#include <znc/znc.h>
#include <signal.h>
+#include <time.h>
using std::cout;
using std::endl;
diff --git a/src/znc.cpp b/src/znc.cpp
index 9e66f3d..dce1372 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -21,6 +21,8 @@
#include <znc/IRCNetwork.h>
#include <znc/Config.h>
+#include <time.h>
+
using std::endl;
using std::cout;
using std::map;
--
1.9.2