Skip to content

Commit

Permalink
Use expected LIGHTNING_DIR_FILE_H define
Browse files Browse the repository at this point in the history
  • Loading branch information
practicalswift authored and rustyrussell committed Mar 25, 2018
1 parent 98f49c0 commit a4059ef
Show file tree
Hide file tree
Showing 19 changed files with 49 additions and 49 deletions.
6 changes: 3 additions & 3 deletions channeld/channeld_htlc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_LIGHTNINGD_CHANNEL_CHANNELD_HTLC_H
#define LIGHTNING_LIGHTNINGD_CHANNEL_CHANNELD_HTLC_H
#ifndef LIGHTNING_CHANNELD_CHANNELD_HTLC_H
#define LIGHTNING_CHANNELD_CHANNELD_HTLC_H
#include "config.h"
#include <bitcoin/locktime.h>
#include <ccan/short_types/short_types.h>
Expand Down Expand Up @@ -81,4 +81,4 @@ static inline bool htlc_is_dead(const struct htlc *htlc)
return htlc->state == RCVD_REMOVE_ACK_REVOCATION
|| htlc->state == SENT_REMOVE_ACK_REVOCATION;
}
#endif /* LIGHTNING_LIGHTNINGD_CHANNEL_CHANNELD_HTLC_H */
#endif /* LIGHTNING_CHANNELD_CHANNELD_HTLC_H */
6 changes: 3 additions & 3 deletions channeld/commit_tx.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_LIGHTNINGD_CHANNEL_COMMIT_TX_H
#define LIGHTNING_LIGHTNINGD_CHANNEL_COMMIT_TX_H
#ifndef LIGHTNING_CHANNELD_COMMIT_TX_H
#define LIGHTNING_CHANNELD_COMMIT_TX_H
#include "config.h"
#include <bitcoin/pubkey.h>
#include <channeld/channeld_htlc.h>
Expand Down Expand Up @@ -57,4 +57,4 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
u64 obscured_commitment_number,
enum side side);

#endif /* LIGHTNING_LIGHTNINGD_CHANNEL_COMMIT_TX_H */
#endif /* LIGHTNING_CHANNELD_COMMIT_TX_H */
6 changes: 3 additions & 3 deletions channeld/full_channel.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* This is the full channel routines, with HTLC support. */
#ifndef LIGHTNING_LIGHTNINGD_CHANNEL_FULL_CHANNEL_H
#define LIGHTNING_LIGHTNINGD_CHANNEL_FULL_CHANNEL_H
#ifndef LIGHTNING_CHANNELD_FULL_CHANNEL_H
#define LIGHTNING_CHANNELD_FULL_CHANNEL_H
#include "config.h"
#include <channeld/channeld_htlc.h>
#include <channeld/full_channel_error.h>
Expand Down Expand Up @@ -250,4 +250,4 @@ void dump_htlcs(const struct channel *channel, const char *prefix);
const char *channel_add_err_name(enum channel_add_err e);
const char *channel_remove_err_name(enum channel_remove_err e);

#endif /* LIGHTNING_LIGHTNINGD_CHANNEL_FULL_CHANNEL_H */
#endif /* LIGHTNING_CHANNELD_FULL_CHANNEL_H */
6 changes: 3 additions & 3 deletions common/bech32.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
* THE SOFTWARE.
*/

#ifndef _SEGWIT_ADDR_H_
#define _SEGWIT_ADDR_H_ 1
#ifndef LIGHTNING_COMMON_BECH32_H
#define LIGHTNING_COMMON_BECH32_H
#include "config.h"

#include <stdint.h>
Expand Down Expand Up @@ -119,4 +119,4 @@ int bech32_convert_bits(uint8_t* out, size_t* outlen, int outbits,
extern const char bech32_charset[32];
extern const int8_t bech32_charset_rev[128];

#endif /* LIGHTNING_LIGHTNINGD_BECH32_H */
#endif /* LIGHTNING_COMMON_BECH32_H */
2 changes: 1 addition & 1 deletion common/bolt11.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ char *bolt11_encode_(const tal_t *ctx,
*/
struct bolt11 *bolt11_out_check(const struct bolt11 *bolt11,
const char *abortstr);
#endif /* LIGHTNING_LIGHTNINGD_BOLT11_H */
#endif /* LIGHTNING_COMMON_BOLT11_H */
2 changes: 1 addition & 1 deletion common/close_tx.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ struct bitcoin_tx *create_close_tx(const tal_t *ctx,
u64 anchor_satoshis,
uint64_t to_us, uint64_t to_them,
uint64_t dust_limit);
#endif
#endif /* LIGHTNING_COMMON_CLOSE_TX_H */
6 changes: 3 additions & 3 deletions gossipd/broadcast.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_LIGHTNINGD_GOSSIP_BROADCAST_H
#define LIGHTNING_LIGHTNINGD_GOSSIP_BROADCAST_H
#ifndef LIGHTNING_GOSSIPD_BROADCAST_H
#define LIGHTNING_GOSSIPD_BROADCAST_H
#include "config.h"

#include <ccan/intmap/intmap.h>
Expand Down Expand Up @@ -29,4 +29,4 @@ bool replace_broadcast(const tal_t *ctx,
const u8 *next_broadcast(struct broadcast_state *bstate, u64 *last_index);

const u8 *get_broadcast(struct broadcast_state *bstate, u64 msgidx);
#endif /* LIGHTNING_LIGHTNINGD_GOSSIP_BROADCAST_H */
#endif /* LIGHTNING_GOSSIPD_BROADCAST_H */
6 changes: 3 additions & 3 deletions gossipd/handshake.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_LIGHTNINGD_GOSSIP_HANDSHAKE_H
#define LIGHTNING_LIGHTNINGD_GOSSIP_HANDSHAKE_H
#ifndef LIGHTNING_GOSSIPD_HANDSHAKE_H
#define LIGHTNING_GOSSIPD_HANDSHAKE_H
#include "config.h"
#include <ccan/typesafe_cb/typesafe_cb.h>

Expand Down Expand Up @@ -51,4 +51,4 @@ struct io_plan *responder_handshake_(struct io_conn *conn,
void *cbarg),
void *cbarg);

#endif /* LIGHTNING_LIGHTNINGD_GOSSIP_HANDSHAKE_H */
#endif /* LIGHTNING_GOSSIPD_HANDSHAKE_H */
6 changes: 3 additions & 3 deletions gossipd/routing.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_LIGHTNINGD_GOSSIP_ROUTING_H
#define LIGHTNING_LIGHTNINGD_GOSSIP_ROUTING_H
#ifndef LIGHTNING_GOSSIPD_ROUTING_H
#define LIGHTNING_GOSSIPD_ROUTING_H
#include "config.h"
#include <bitcoin/pubkey.h>
#include <ccan/crypto/siphash24/siphash24.h>
Expand Down Expand Up @@ -253,4 +253,4 @@ void route_prune(struct routing_state *rstate);
* the direction bit the matching channel should get */
#define get_channel_direction(from, to) (pubkey_cmp(from, to) > 0)

#endif /* LIGHTNING_LIGHTNINGD_GOSSIP_ROUTING_H */
#endif /* LIGHTNING_GOSSIPD_ROUTING_H */
6 changes: 3 additions & 3 deletions hsmd/client.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* API to ask the HSM for things. */
#ifndef LIGHTNING_LIGHTNINGD_HSM_CLIENT_H
#define LIGHTNING_LIGHTNINGD_HSM_CLIENT_H
#ifndef LIGHTNING_HSMD_CLIENT_H
#define LIGHTNING_HSMD_CLIENT_H
#include "config.h"
#include <ccan/endian/endian.h>
#include <ccan/short_types/short_types.h>
Expand All @@ -14,4 +14,4 @@ void hsm_setup(int fd);

/* Do ECDH using this node id secret. */
bool hsm_do_ecdh(struct secret *ss, const struct pubkey *point);
#endif /* LIGHTNING_LIGHTNINGD_HSM_CLIENT_H */
#endif /* LIGHTNING_HSMD_CLIENT_H */
2 changes: 1 addition & 1 deletion lightningd/json.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ void json_add_address(struct json_result *response, const char *fieldname,
const struct wireaddr *addr);


#endif /* !defined (LIGHTNING_LIGHTNINGD_JSON_H) */
#endif /* LIGHTNING_LIGHTNINGD_JSON_H */
2 changes: 1 addition & 1 deletion lightningd/jsonrpc_errors.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#define PAY_UNSPECIFIED_ERROR 209
#define PAY_STOPPED_RETRYING 210

#endif /* !defined (LIGHTNING_LIGHTNINGD_JSONRPC_ERRORS_H) */
#endif /* LIGHTNING_LIGHTNINGD_JSONRPC_ERRORS_H */
6 changes: 3 additions & 3 deletions onchaind/onchain_types.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_TYPES_H
#define LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_TYPES_H
#ifndef LIGHTNING_ONCHAIND_ONCHAIN_TYPES_H
#define LIGHTNING_ONCHAIND_ONCHAIN_TYPES_H
#include "config.h"

/* Different transactions we care about. */
Expand Down Expand Up @@ -64,4 +64,4 @@ enum output_type {
};


#endif /* LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_TYPES_H */
#endif /* LIGHTNING_ONCHAIND_ONCHAIN_TYPES_H */
6 changes: 3 additions & 3 deletions onchaind/onchain_wire.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_WIRE_H
#define LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_WIRE_H
#ifndef LIGHTNING_ONCHAIND_ONCHAIN_WIRE_H
#define LIGHTNING_ONCHAIND_ONCHAIN_WIRE_H
#include "config.h"
#include <ccan/short_types/short_types.h>
#include <ccan/tal/tal.h>
Expand All @@ -15,4 +15,4 @@ struct htlc_stub {
void towire_htlc_stub(u8 **pptr, const struct htlc_stub *htlc_stub);
void fromwire_htlc_stub(const u8 **cursor, size_t *max,
struct htlc_stub *htlc_stub);
#endif /* LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_WIRE_H */
#endif /* LIGHTNING_ONCHAIND_ONCHAIN_WIRE_H */
6 changes: 3 additions & 3 deletions wallet/db.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef WALLET_DB_H
#define WALLET_DB_H
#ifndef LIGHTNING_WALLET_DB_H
#define LIGHTNING_WALLET_DB_H
#include "config.h"

#include <bitcoin/preimage.h>
Expand Down Expand Up @@ -156,4 +156,4 @@ bool sqlite3_column_sha256_double(sqlite3_stmt *stmt, int col, struct sha256_do
bool sqlite3_bind_sha256_double(sqlite3_stmt *stmt, int col, const struct sha256_double *p);
struct secret *sqlite3_column_secrets(const tal_t *ctx,
sqlite3_stmt *stmt, int col);
#endif /* WALLET_DB_H */
#endif /* LIGHTNING_WALLET_DB_H */
6 changes: 3 additions & 3 deletions wallet/test/test_utils.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_WALLET_TEST_UTILS_H
#define LIGHTNING_WALLET_TEST_UTILS_H
#ifndef LIGHTNING_WALLET_TEST_TEST_UTILS_H
#define LIGHTNING_WALLET_TEST_TEST_UTILS_H

/* Definitions "inspired" by libsecp256k1 */
#define TEST_FAILURE(msg) do { \
Expand All @@ -21,4 +21,4 @@

#define CHECK(cond) CHECK_MSG(cond,"test condition failed");

#endif /* LIGHTNING_WALLET_TEST_UTILS_H */
#endif /* LIGHTNING_WALLET_TEST_TEST_UTILS_H */
6 changes: 3 additions & 3 deletions wallet/txfilter.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIGHTNING_LIGHTNINGD_TXFILTER_H
#define LIGHTNING_LIGHTNINGD_TXFILTER_H
#ifndef LIGHTNING_WALLET_TXFILTER_H
#define LIGHTNING_WALLET_TXFILTER_H
#include "config.h"
#include <bitcoin/pubkey.h>
#include <bitcoin/tx.h>
Expand Down Expand Up @@ -61,4 +61,4 @@ bool outpointfilter_matches(struct outpointfilter *of,
void outpointfilter_remove(struct outpointfilter *of,
const struct bitcoin_txid *txid, const u32 outnum);

#endif /* LIGHTNING_LIGHTNINGD_TXFILTER_H */
#endif /* LIGHTNING_WALLET_TXFILTER_H */
6 changes: 3 additions & 3 deletions wallet/wallet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef WALLET_WALLET_H
#define WALLET_WALLET_H
#ifndef LIGHTNING_WALLET_WALLET_H
#define LIGHTNING_WALLET_WALLET_H

#include "config.h"
#include "db.h"
Expand Down Expand Up @@ -792,4 +792,4 @@ void wallet_utxoset_add(struct wallet *w, const struct bitcoin_tx *tx,
const u32 outnum, const u32 blockheight,
const u32 txindex, const u8 *scriptpubkey,
const u64 satoshis);
#endif /* WALLET_WALLET_H */
#endif /* LIGHTNING_WALLET_WALLET_H */
6 changes: 3 additions & 3 deletions wallet/walletrpc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef WALLET_WALLETRPC_H
#define WALLET_WALLETRPC_H
#ifndef LIGHTNING_WALLET_WALLETRPC_H
#define LIGHTNING_WALLET_WALLETRPC_H

#include "config.h"

Expand All @@ -8,4 +8,4 @@
* handlers are registered using AUTODATA.
*/

#endif /* WALLET_WALLETRPC_H */
#endif /* LIGHTNING_WALLET_WALLETRPC_H */

0 comments on commit a4059ef

Please sign in to comment.