sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#22914: util: remove libevent <= 2.0.18 back-compat code

Browse Source 
6045a1464252075f4135bd4a69d202d55d124eb2 util: remove libevent <= 2.0.18 back-compat code (fanquake)

Pull request description:

  Now that we require libevent >=2.0.21, remove backwards compatibility code for older versions.

ACKs for top commit:
  kristapsk:
    ACK 6045a1464252075f4135bd4a69d202d55d124eb2

Tree-SHA512: 49a237ee3cef78b105f8ea91dc3e541fe700fe3a3d02a88f85ec91772068ffbe508dbe196a4d693399b2bcf903251b9bc2573f04cb8f2e21a2ea481f35bfde32
This commit is contained in:
fanquake 2021-09-09 21:54:14 +08:00 committed by PastaPastaPasta
parent 026d3f5fd5
commit 90440af61c
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bitcoin-cli.cpp
View File

@ -76,9 +76,6 @@ static void SetupCliArgs(ArgsManager& argsman)
/** libevent event log callback */ /** libevent event log callback */
static void libevent_log_cb(int severity, const char *msg) static void libevent_log_cb(int severity, const char *msg)
{ {
#ifndef EVENT_LOG_ERR // EVENT_LOG_ERR was added in 2.0.19; but before then _EVENT_LOG_ERR existed.
# define EVENT_LOG_ERR _EVENT_LOG_ERR
#endif
// Ignore everything other than errors // Ignore everything other than errors
if (severity >= EVENT_LOG_ERR) { if (severity >= EVENT_LOG_ERR) {
throw std::runtime_error(strprintf("libevent error: %s", msg)); throw std::runtime_error(strprintf("libevent error: %s", msg));

4
src/httpserver.cpp
View File

@ -347,10 +347,6 @@ static void HTTPWorkQueueRun(WorkQueue<HTTPClosure>* queue, int worker_num)
/** libevent event log callback */ /** libevent event log callback */
static void libevent_log_cb(int severity, const char *msg) static void libevent_log_cb(int severity, const char *msg)
{ {
#ifndef EVENT_LOG_WARN
// EVENT_LOG_WARN was added in 2.0.19; but before then _EVENT_LOG_WARN existed.
# define EVENT_LOG_WARN _EVENT_LOG_WARN
#endif
if (severity >= EVENT_LOG_WARN) // Log warn messages and higher without debug category if (severity >= EVENT_LOG_WARN) // Log warn messages and higher without debug category
LogPrintf("libevent: %s\n", msg); LogPrintf("libevent: %s\n", msg);
// The below code causes log spam on Travis and the output of these logs has never been of any use so far // The below code causes log spam on Travis and the output of these logs has never been of any use so far