header cleanup: sort include lines into alpha order, after config.h

This makes merging easier in future. Signed-off-by: Rusty Russell <[email protected]>
philsong · Jan 21, 2016 · d733e82 · d733e82
1 parent 4dafeba
commit d733e82
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 12 deletions.
diff --git a/bitcoin/address.h b/bitcoin/address.h
@@ -1,7 +1,8 @@
 #ifndef LIGHTNING_BITCOIN_ADDRESS_H
 #define LIGHTNING_BITCOIN_ADDRESS_H
-#include <ccan/short_types/short_types.h>
+#include "config.h"
 #include <ccan/crypto/ripemd160/ripemd160.h>
+#include <ccan/short_types/short_types.h>
 
 struct pubkey;
 

diff --git a/bitcoin/base58.h b/bitcoin/base58.h
@@ -1,5 +1,7 @@
 #ifndef LIGHTNING_BITCOIN_BASE58_H
 #define LIGHTNING_BITCOIN_BASE58_H
+#include "config.h"
+
 #include <ccan/crypto/ripemd160/ripemd160.h>
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>

diff --git a/bitcoin/locktime.h b/bitcoin/locktime.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_BITCOIN_LOCKTIME_H
 #define LIGHTNING_BITCOIN_LOCKTIME_H
+#include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <stdbool.h>
 

diff --git a/bitcoin/privkey.h b/bitcoin/privkey.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_BITCOIN_PRIVKEY_H
 #define LIGHTNING_BITCOIN_PRIVKEY_H
+#include "config.h"
 #include <ccan/short_types/short_types.h>
 
 /* This is a private key.  Keep it secret. */

diff --git a/bitcoin/pubkey.h b/bitcoin/pubkey.h
@@ -1,8 +1,9 @@
 #ifndef LIGHTNING_BITCOIN_PUBKEY_H
 #define LIGHTNING_BITCOIN_PUBKEY_H
+#include "config.h"
+#include "secp256k1.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
-#include "secp256k1.h"
 
 struct privkey;
 

diff --git a/bitcoin/script.h b/bitcoin/script.h
@@ -1,8 +1,9 @@
 #ifndef LIGHTNING_BITCOIN_SCRIPT_H
 #define LIGHTNING_BITCOIN_SCRIPT_H
+#include "config.h"
+#include "signature.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
-#include "signature.h"
 
 struct bitcoin_address;
 struct pubkey;

diff --git a/bitcoin/shadouble.h b/bitcoin/shadouble.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_BITCOIN_SHADOUBLE_H
 #define LIGHTNING_BITCOIN_SHADOUBLE_H
+#include "config.h"
 #include <ccan/crypto/sha256/sha256.h>
 
 /* To explicitly distinguish between single sha and bitcoin's standard double */

diff --git a/bitcoin/signature.h b/bitcoin/signature.h
@@ -1,8 +1,9 @@
 #ifndef LIGHTNING_BITCOIN_SIGNATURE_H
 #define LIGHTNING_BITCOIN_SIGNATURE_H
+#include "config.h"
+#include "secp256k1.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
-#include "secp256k1.h"
 
 enum sighash_type {
     SIGHASH_ALL = 1,

diff --git a/bitcoin/tx.h b/bitcoin/tx.h
@@ -1,8 +1,9 @@
 #ifndef LIGHTNING_BITCOIN_TX_H
 #define LIGHTNING_BITCOIN_TX_H
+#include "config.h"
+#include "shadouble.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
-#include "shadouble.h"
 
 /* We unpack varints for our in-memory representation */
 #define varint_t u64

diff --git a/close_tx.h b/close_tx.h
@@ -1,7 +1,8 @@
 #ifndef LIGHTNING_CLOSE_TX_H
 #define LIGHTNING_CLOSE_TX_H
-#include <ccan/tal/tal.h>
+#include "config.h"
 #include "lightning.pb-c.h"
+#include <ccan/tal/tal.h>
 
 struct sha256_double;
 

diff --git a/commit_tx.h b/commit_tx.h
@@ -1,7 +1,8 @@
 #ifndef LIGHTNING_COMMIT_TX_H
 #define LIGHTNING_COMMIT_TX_H
-#include <ccan/tal/tal.h>
+#include "config.h"
 #include "lightning.pb-c.h"
+#include <ccan/tal/tal.h>
 
 struct channel_state;
 struct sha256_double;

diff --git a/find_p2sh_out.h b/find_p2sh_out.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_FIND_P2SH_OUT_H
 #define LIGHTNING_FIND_P2SH_OUT_H
+#include "config.h"
 #include <ccan/short_types/short_types.h>
 
 struct bitcoin_tx;

diff --git a/funding.h b/funding.h
@@ -1,10 +1,10 @@
 #ifndef LIGHTNING_FUNDING_H
 #define LIGHTNING_FUNDING_H
+#include "config.h"
+#include "lightning.pb-c.h"
 #include <ccan/tal/tal.h>
 #include <stdbool.h>
 
-#include "lightning.pb-c.h"
-
 struct channel_oneside {
 	/* Payment and fee is in millisatoshi. */
 	uint32_t pay_msat, fee_msat;

diff --git a/opt_bits.h b/opt_bits.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_OPT_BITS_H
 #define LIGHTNING_OPT_BITS_H
+#include "config.h"
 #include <ccan/opt/opt.h>
 #include <ccan/short_types/short_types.h>
 

diff --git a/overflows.h b/overflows.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_OVERFLOWS_H
 #define LIGHTNING_OVERFLOWS_H
+#include "config.h"
 
 static inline bool add_overflows_size_t(uint64_t a, uint64_t b)
 {

diff --git a/permute_tx.h b/permute_tx.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_PERMUTE_TX_H
 #define LIGHTNING_PERMUTE_TX_H
+#include "config.h"
 #include "bitcoin/tx.h"
 
 /* Permute the transaction into BIP69 order.

diff --git a/pkt.h b/pkt.h
@@ -1,14 +1,16 @@
 #ifndef LIGHTNING_PKT_H
 #define LIGHTNING_PKT_H
+#include "config.h"
+
 /* Simple (non-threadsafe!) wrapper for protobufs.
  *
  * This could be a simple set of macros, if the protobuf-c people hadn't
  * insisted on "prettifing" the names they generate into CamelCase.
  */
+#include "lightning.pb-c.h"
 #include <ccan/endian/endian.h>
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
-#include "lightning.pb-c.h"
 
 /* A packet, ready to be de-protobuf'ed. */
 struct pkt {

diff --git a/protobuf_convert.h b/protobuf_convert.h
@@ -1,8 +1,9 @@
 #ifndef LIGHTNING_PROTOBUF_CONVERT_H
 #define LIGHTNING_PROTOBUF_CONVERT_H
+#include "config.h"
+#include "lightning.pb-c.h"
 #include <ccan/tal/tal.h>
 #include <stdbool.h>
-#include "lightning.pb-c.h"
 
 /* Convert to-from protobuf to internal representation. */
 struct signature;

diff --git a/state.h b/state.h
@@ -1,8 +1,10 @@
 #ifndef LIGHTNING_STATE_H
 #define LIGHTNING_STATE_H
+#include "config.h"
+
+#include <ccan/tal/tal.h>
 #include <state_types.h>
 #include <stdbool.h>
-#include <ccan/tal/tal.h>
 
 enum cmd_complete_status {
 	CMD_STATUS_ONGOING,

diff --git a/state_types.h b/state_types.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_STATE_TYPES_H
 #define LIGHTNING_STATE_TYPES_H
+#include "config.h"
 /* FIXME: cdump is really dumb, so we put these in their own header. */
 #include "lightning.pb-c.h"
 

diff --git a/version.h b/version.h
@@ -1,5 +1,6 @@
 #ifndef LIGHTNING_VERSION_H
 #define LIGHTNING_VERSION_H
+#include "config.h"
 #include <ccan/opt/opt.h>
 
 char *version_and_exit(const void *unused);