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 /ssl | |
| 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 'ssl')
| -rw-r--r-- | ssl/d1_lib.c | 2 | ||||
| -rw-r--r-- | ssl/s3_lib.c | 1 | ||||
| -rw-r--r-- | ssl/ssl_cert.c | 4 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 2 | ||||
| -rw-r--r-- | ssl/statem/statem.c | 2 |
5 files changed, 3 insertions, 8 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index e4abe92ac1..6c594a2686 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -7,11 +7,11 @@ * https://www.openssl.org/source/license.html */ +#include "e_os.h" #include <stdio.h> #include <openssl/objects.h> #include <openssl/rand.h> #include "ssl_locl.h" -#include "e_os.h" #if defined(OPENSSL_SYS_VXWORKS) # include <sys/times.h> diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 1a5c3f76b8..c9371af9c9 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -13,7 +13,6 @@ #include <openssl/objects.h> #include "internal/nelem.h" #include "ssl_locl.h" -#include "e_os.h" #include <openssl/md5.h> #include <openssl/dh.h> #include <openssl/rand.h> diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index bbffce0f93..ba5fb653fe 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -12,10 +12,6 @@ #include <sys/types.h> #include "internal/nelem.h" -#ifndef NO_SYS_TYPES_H -# include <sys/types.h> -#endif - #include "internal/o_dir.h" #include <openssl/lhash.h> #include <openssl/bio.h> diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 72f48752e9..f3fc5bc25a 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -11,12 +11,12 @@ #ifndef HEADER_SSL_LOCL_H # define HEADER_SSL_LOCL_H +# include "e_os.h" /* struct timeval for Windows */ # include <stdlib.h> # include <time.h> # include <string.h> # include <errno.h> -# include "e_os.h" /* struct timeval for Windows */ # if defined(__unix) || defined(__unix__) # include <sys/time.h> /* struct timeval for DTLS */ # endif diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index fd48f666c0..d171ece2a0 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/rand.h> #include "e_os.h" +#include <openssl/rand.h> #include "../ssl_locl.h" #include "statem_locl.h" |