From 4d672077e16d8b13ea2cfb7f97eea521d832e10a Mon Sep 17 00:00:00 2001 From: Moller40 Date: Tue, 8 Sep 2020 14:42:30 +0200 Subject: [PATCH] Avoid compile error on macos mojave Fixing the following error by changing 'enum feerate' to int. lightningd/bitcoind.c:183:29: error: result of comparison of constant 8 with expression of type 'enum feerate' is always true [-Werror, -Wtautological-constant-out-of-range-compare] for (enum feerate f = 0; f < NUM_FEERATES; f++) { Changelog-Fixed: compile error on macos --- lightningd/bitcoind.c | 2 +- lightningd/chaintopology.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c index c3cd31141..f9bd760c3 100644 --- a/lightningd/bitcoind.c +++ b/lightningd/bitcoind.c @@ -181,7 +181,7 @@ static void estimatefees_callback(const char *buf, const jsmntok_t *toks, "estimatefees", "bad 'result' field"); - for (enum feerate f = 0; f < NUM_FEERATES; f++) { + for (int f = 0; f < NUM_FEERATES; f++) { feeratetok = json_get_member(buf, resulttok, feerate_name(f)); if (!feeratetok) bitcoin_plugin_error(call->bitcoind, buf, toks, diff --git a/lightningd/chaintopology.c b/lightningd/chaintopology.c index dc8c7a745..4c16f72c5 100644 --- a/lightningd/chaintopology.c +++ b/lightningd/chaintopology.c @@ -362,7 +362,7 @@ static void add_feerate_history(struct chain_topology *topo, /* Did the the feerate change since we last estimated it ? */ static bool feerate_changed(struct chain_topology *topo, u32 old_feerates[]) { - for (enum feerate f = 0; f < NUM_FEERATES; f++) { + for (int f = 0; f < NUM_FEERATES; f++) { if (try_get_feerate(topo, f) != old_feerates[f]) return true; }