diff options
| author | fanquake <fanquake@gmail.com> | 2021-09-09 21:54:14 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-09 21:54:27 +0800 |
| commit | 1d0c57a05c2f59025eedd41ed72309505c795969 (patch) | |
| tree | 880925cf64dec9c17e3395785f7359286f82eb96 /src | |
| parent | 020c2b7609d037fe4d1bb321419d8d455716d6fb (diff) | |
| parent | 6045a1464252075f4135bd4a69d202d55d124eb2 (diff) | |
Merge bitcoin/bitcoin#22914: util: remove libevent <= 2.0.18 back-compat code
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bitcoin-cli.cpp | 3 | ||||
| -rw-r--r-- | src/httpserver.cpp | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 297f3066ff..e75ba81b54 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -93,9 +93,6 @@ static void SetupCliArgs(ArgsManager& argsman) /** libevent event log callback */ 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 if (severity >= EVENT_LOG_ERR) { throw std::runtime_error(strprintf("libevent error: %s", msg)); diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 8741ad9b86..fa0379f612 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -338,10 +338,6 @@ static void HTTPWorkQueueRun(WorkQueue<HTTPClosure>* queue, int worker_num) /** libevent event log callback */ 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 LogPrintf("libevent: %s\n", msg); else |