diff --git a/src/netbase.cpp b/src/netbase.cpp index 264029d8a2c..93c395b9ec8 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -271,14 +272,6 @@ CService LookupNumeric(const std::string& name, int portDefault) return addr; } -struct timeval MillisToTimeval(int64_t nTimeout) -{ - struct timeval timeout; - timeout.tv_sec = nTimeout / 1000; - timeout.tv_usec = (nTimeout % 1000) * 1000; - return timeout; -} - /** SOCKS version */ enum SOCKSVersion: uint8_t { SOCKS4 = 0x04, diff --git a/src/netbase.h b/src/netbase.h index ac4cd97673a..3dc656d0db7 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -62,10 +62,6 @@ bool CloseSocket(SOCKET& hSocket); bool SetSocketNonBlocking(const SOCKET& hSocket, bool fNonBlocking); /** Set the TCP_NODELAY flag on a socket */ bool SetSocketNoDelay(const SOCKET& hSocket); -/** - * Convert milliseconds to a struct timeval for e.g. select. - */ -struct timeval MillisToTimeval(int64_t nTimeout); void InterruptSocks5(bool interrupt); #endif // BITCOIN_NETBASE_H diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 90ee9422ba3..208794a4e5a 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/src/util/time.cpp b/src/util/time.cpp index e96972fe123..4da041e5a56 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -7,6 +7,7 @@ #include #endif +#include #include #include @@ -114,3 +115,11 @@ int64_t ParseISO8601DateTime(const std::string& str) return 0; return (ptime - epoch).total_seconds(); } + +struct timeval MillisToTimeval(int64_t nTimeout) +{ + struct timeval timeout; + timeout.tv_sec = nTimeout / 1000; + timeout.tv_usec = (nTimeout % 1000) * 1000; + return timeout; +} diff --git a/src/util/time.h b/src/util/time.h index c69f604dc62..2c0e3d83f6b 100644 --- a/src/util/time.h +++ b/src/util/time.h @@ -6,6 +6,8 @@ #ifndef BITCOIN_UTIL_TIME_H #define BITCOIN_UTIL_TIME_H +#include + #include #include #include @@ -57,4 +59,9 @@ std::string FormatISO8601DateTime(int64_t nTime); std::string FormatISO8601Date(int64_t nTime); int64_t ParseISO8601DateTime(const std::string& str); +/** + * Convert milliseconds to a struct timeval for e.g. select. + */ +struct timeval MillisToTimeval(int64_t nTimeout); + #endif // BITCOIN_UTIL_TIME_H