Merge pull request #7016

aee22bf Avoid a compile error on hosts with libevent too old for EVENT_LOG_WARN. (Gregory Maxwell)
This commit is contained in:
Wladimir J. van der Laan 2015-11-16 12:03:12 +01:00
commit dafefb7924
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -365,6 +365,10 @@ static void HTTPWorkQueueRun(WorkQueue<HTTPClosure>* queue)
/** 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);
else else