Skip to content

Commit

Permalink
Use angle bracket in include for zmq
Browse files Browse the repository at this point in the history
Summary:
As per title

Partial backport of PR11651

Test Plan:
  make check
  ninja check

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D2850
  • Loading branch information
Fabcien committed Apr 21, 2019
1 parent 29c2cb3 commit d845e01
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 21 deletions.
5 changes: 3 additions & 2 deletions src/zmq/zmqabstractnotifier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "zmqabstractnotifier.h"
#include "util.h"
#include <zmq/zmqabstractnotifier.h>

#include <util.h>

CZMQAbstractNotifier::~CZMQAbstractNotifier() {
assert(!psocket);
Expand Down
2 changes: 1 addition & 1 deletion src/zmq/zmqabstractnotifier.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef BITCOIN_ZMQ_ZMQABSTRACTNOTIFIER_H
#define BITCOIN_ZMQ_ZMQABSTRACTNOTIFIER_H

#include "zmqconfig.h"
#include <zmq/zmqconfig.h>

class CBlockIndex;
class CZMQAbstractNotifier;
Expand Down
6 changes: 3 additions & 3 deletions src/zmq/zmqconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define BITCOIN_ZMQ_ZMQCONFIG_H

#if defined(HAVE_CONFIG_H)
#include "config/bitcoin-config.h"
#include <config/bitcoin-config.h>
#endif

#include <string>
Expand All @@ -15,8 +15,8 @@
#include <zmq.h>
#endif

#include "primitives/block.h"
#include "primitives/transaction.h"
#include <primitives/block.h>
#include <primitives/transaction.h>

void zmqError(const char *str);

Expand Down
12 changes: 6 additions & 6 deletions src/zmq/zmqnotificationinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "zmqnotificationinterface.h"
#include "zmqpublishnotifier.h"
#include <zmq/zmqnotificationinterface.h>
#include <zmq/zmqpublishnotifier.h>

#include "streams.h"
#include "util.h"
#include "validation.h"
#include "version.h"
#include <streams.h>
#include <util.h>
#include <validation.h>
#include <version.h>

void zmqError(const char *str) {
LogPrint(BCLog::ZMQ, "zmq: Error: %s, errno=%s\n", str,
Expand Down
2 changes: 1 addition & 1 deletion src/zmq/zmqnotificationinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef BITCOIN_ZMQ_ZMQNOTIFICATIONINTERFACE_H
#define BITCOIN_ZMQ_ZMQNOTIFICATIONINTERFACE_H

#include "validationinterface.h"
#include <validationinterface.h>

#include <list>
#include <map>
Expand Down
15 changes: 8 additions & 7 deletions src/zmq/zmqpublishnotifier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "zmqpublishnotifier.h"
#include "chain.h"
#include "config.h"
#include "rpc/server.h"
#include "streams.h"
#include "util.h"
#include "validation.h"
#include <zmq/zmqpublishnotifier.h>

#include <chain.h>
#include <config.h>
#include <rpc/server.h>
#include <streams.h>
#include <util.h>
#include <validation.h>

#include <cstdarg>

Expand Down
2 changes: 1 addition & 1 deletion src/zmq/zmqpublishnotifier.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef BITCOIN_ZMQ_ZMQPUBLISHNOTIFIER_H
#define BITCOIN_ZMQ_ZMQPUBLISHNOTIFIER_H

#include "zmqabstractnotifier.h"
#include <zmq/zmqabstractnotifier.h>

class CBlockIndex;

Expand Down

0 comments on commit d845e01

Please sign in to comment.