mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-19 13:27:35 +02:00
Merge ca424e242a into merged_master (Bitcoin PR bitcoin/bitcoin#22200)
This commit is contained in:
commit
fbe798102e
2 changed files with 8 additions and 4 deletions
|
|
@ -5,10 +5,12 @@
|
|||
#include <zmq/zmqutil.h>
|
||||
|
||||
#include <logging.h>
|
||||
|
||||
#include <zmq.h>
|
||||
|
||||
void zmqError(const char* str)
|
||||
#include <cerrno>
|
||||
#include <string>
|
||||
|
||||
void zmqError(const std::string& str)
|
||||
{
|
||||
LogPrint(BCLog::ZMQ, "zmq: Error: %s, errno=%s\n", str, zmq_strerror(errno));
|
||||
LogPrint(BCLog::ZMQ, "zmq: Error: %s, msg: %s\n", str, zmq_strerror(errno));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
#ifndef BITCOIN_ZMQ_ZMQUTIL_H
|
||||
#define BITCOIN_ZMQ_ZMQUTIL_H
|
||||
|
||||
void zmqError(const char* str);
|
||||
#include <string>
|
||||
|
||||
void zmqError(const std::string& str);
|
||||
|
||||
#endif // BITCOIN_ZMQ_ZMQUTIL_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue