From e0d9b6efdf955fbd5e1c984171bbbc6a216129f1 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 7 Mar 2017 11:27:09 +1030 Subject: [PATCH] daemon/watch: fix macro clash. 'peer' vs 'struct peer' works iff the argument is actually called 'peer'. Signed-off-by: Rusty Russell --- daemon/watch.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/watch.h b/daemon/watch.h index 37281c2ec..0b2ff7db5 100644 --- a/daemon/watch.h +++ b/daemon/watch.h @@ -81,8 +81,8 @@ struct txwatch *watch_txid_(const tal_t *ctx, void *), void *cbdata); -#define watch_txid(ctx, topo, peer, txid, cb, cbdata) \ - watch_txid_((ctx), (topo), (peer), (txid), \ +#define watch_txid(ctx, topo, peer_, txid, cb, cbdata) \ + watch_txid_((ctx), (topo), (peer_), (txid), \ typesafe_cb_preargs(enum watch_result, void *, \ (cb), (cbdata), \ struct peer *, \ @@ -100,8 +100,8 @@ struct txwatch *watch_tx_(const tal_t *ctx, void *), void *cbdata); -#define watch_tx(ctx, topo, peer, tx, cb, cbdata) \ - watch_tx_((ctx), (topo), (peer), (tx), \ +#define watch_tx(ctx, topo, peer_, tx, cb, cbdata) \ + watch_tx_((ctx), (topo), (peer_), (tx), \ typesafe_cb_preargs(enum watch_result, void *, \ (cb), (cbdata), \ struct peer *, \ @@ -120,8 +120,8 @@ struct txowatch *watch_txo_(const tal_t *ctx, void *), void *cbdata); -#define watch_txo(ctx, topo, peer, txid, outnum, cb, cbdata) \ - watch_txo_((ctx), (topo), (peer), (txid), (outnum), \ +#define watch_txo(ctx, topo, peer_, txid, outnum, cb, cbdata) \ + watch_txo_((ctx), (topo), (peer_), (txid), (outnum), \ typesafe_cb_preargs(enum watch_result, void *, \ (cb), (cbdata), \ struct peer *, \