diff options
| author | Pauli <paul.dale@oracle.com> | 2017-08-24 09:05:07 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-08-30 07:20:44 +1000 |
| commit | 07016a8a3174db5caf07182930533cf88ad9b0ad (patch) | |
| tree | 42dcb67fa6c72635b76590f8ab698bb4c692d838 /crypto/conf | |
| parent | 9590da2cd67ae23588568c57556d6140fb86f892 (diff) | |
Move e_os.h to be the very first include.
cryptilib.h is the second.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4188)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_api.c | 2 | ||||
| -rw-r--r-- | crypto/conf/conf_lib.c | 2 | ||||
| -rw-r--r-- | crypto/conf/conf_mod.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 6026dca928..6f8947df2c 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -9,11 +9,11 @@ /* Part of the code in here was originally in conf.c, which is now removed */ +#include "e_os.h" #include <stdlib.h> #include <string.h> #include <openssl/conf.h> #include <openssl/conf_api.h> -#include "e_os.h" static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf); static void value_free_stack_doall(CONF_VALUE *a); diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 74759c56d5..06bb3f7ff1 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -7,6 +7,7 @@ * https://www.openssl.org/source/license.html */ +#include "e_os.h" #include <stdio.h> #include <string.h> #include "internal/conf.h" @@ -15,7 +16,6 @@ #include <openssl/conf.h> #include <openssl/conf_api.h> #include <openssl/lhash.h> -#include "e_os.h" static CONF_METHOD *default_CONF_method = NULL; diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index da591cba63..7622d8e1f3 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -7,11 +7,10 @@ * https://www.openssl.org/source/license.html */ +#include "internal/cryptlib.h" #include <stdio.h> #include <ctype.h> #include <openssl/crypto.h> -#include "internal/cryptlib.h" -#include "e_os.h" #include "internal/conf.h" #include "internal/dso.h" #include <openssl/x509.h> |