aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-08 16:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

daemon/watch: fix macro clash.

Browse Source 
'peer' vs 'struct peer' works iff the argument is actually called 'peer'.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-03-07 11:27:09 +10:30
parent 6a14e24a82
commit e0d9b6efdf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/watch.h
View File

@@ -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 *, \