Mercurial > dropbear
changeset 1515:d68d61e7056a
include config.h for options.h. don't need to include options.h when
includes.h brings it in
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 18 Feb 2018 11:22:13 +0800 |
| parents | 6c16a05023aa |
| children | 33b872649eb7 |
| files | cli-tcpfwd.c dbhelpers.h ecc.c ecc.h ecdsa.c includes.h list.c ltc_prng.c ltc_prng.h options.h session.h |
| diffstat | 11 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/cli-tcpfwd.c Sun Feb 18 00:29:17 2018 +0800 +++ b/cli-tcpfwd.c Sun Feb 18 11:22:13 2018 +0800 @@ -23,7 +23,6 @@ * SOFTWARE. */ #include "includes.h" -#include "options.h" #include "dbutil.h" #include "tcpfwd.h" #include "channel.h"
--- a/dbhelpers.h Sun Feb 18 00:29:17 2018 +0800 +++ b/dbhelpers.h Sun Feb 18 11:22:13 2018 +0800 @@ -3,7 +3,7 @@ /* This header defines some things that are also used by libtomcrypt/math. We avoid including normal include.h since that can result in conflicting - definitinos - only include config.h */ + definitions - only include config.h */ #include "config.h" #ifdef __GNUC__
--- a/ecc.c Sun Feb 18 00:29:17 2018 +0800 +++ b/ecc.c Sun Feb 18 11:22:13 2018 +0800 @@ -1,5 +1,4 @@ #include "includes.h" -#include "options.h" #include "ecc.h" #include "dbutil.h" #include "bignum.h"
--- a/ecc.h Sun Feb 18 00:29:17 2018 +0800 +++ b/ecc.h Sun Feb 18 11:22:13 2018 +0800 @@ -2,7 +2,6 @@ #define DROPBEAR_DROPBEAR_ECC_H #include "includes.h" -#include "options.h" #include "buffer.h"
--- a/ecdsa.c Sun Feb 18 00:29:17 2018 +0800 +++ b/ecdsa.c Sun Feb 18 11:22:13 2018 +0800 @@ -1,4 +1,3 @@ -#include "options.h" #include "includes.h" #include "dbutil.h" #include "crypto_desc.h"
--- a/includes.h Sun Feb 18 00:29:17 2018 +0800 +++ b/includes.h Sun Feb 18 11:22:13 2018 +0800 @@ -26,7 +26,6 @@ #define DROPBEAR_INCLUDES_H_ -#include "config.h" #include "options.h" #include "debug.h"
--- a/list.c Sun Feb 18 00:29:17 2018 +0800 +++ b/list.c Sun Feb 18 11:22:13 2018 +0800 @@ -1,4 +1,4 @@ -#include "options.h" +#include "includes.h" #include "dbutil.h" #include "list.h"
--- a/ltc_prng.c Sun Feb 18 00:29:17 2018 +0800 +++ b/ltc_prng.c Sun Feb 18 11:22:13 2018 +0800 @@ -11,7 +11,6 @@ * * Tom St Denis, [email protected], http://libtomcrypt.com */ -#include "options.h" #include "includes.h" #include "dbrandom.h" #include "ltc_prng.h"
--- a/ltc_prng.h Sun Feb 18 00:29:17 2018 +0800 +++ b/ltc_prng.h Sun Feb 18 11:22:13 2018 +0800 @@ -1,7 +1,6 @@ #ifndef DROPBEAR_LTC_PRNG_H_DROPBEAR #define DROPBEAR_LTC_PRNG_H_DROPBEAR -#include "options.h" #include "includes.h" #if DROPBEAR_LTC_PRNG
--- a/options.h Sun Feb 18 00:29:17 2018 +0800 +++ b/options.h Sun Feb 18 11:22:13 2018 +0800 @@ -8,6 +8,9 @@ See default_options.h.in for a description of the available options. */ +/* Some configuration options or checks depend on system config */ +#include "config.h" + #ifdef LOCALOPTIONS_H_EXISTS #include "localoptions.h" #endif