diff options
author | Pauli <paul.dale@oracle.com> | 2017-08-18 13:52:46 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2017-08-30 07:20:43 +1000 |
commit | 677963e5a428739062ab5d46d5baed5eadd0195d (patch) | |
tree | 3afe5ace573d0da8a5272575075ad4aede8dcec5 /include | |
parent | 58891025eff2fb42a6a5cf2fa861d46308826d07 (diff) |
e_os.h removal from other headers and source files.
Removed e_os.h from all bar three headers (apps/apps.h crypto/bio/bio_lcl.h and
ssl/ssl_locl.h).
Added e_os.h into the files that need it now.
Directly reference internal/nelem.h when required.
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 'include')
-rw-r--r-- | include/internal/cryptlib.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index c73c754242..3d348008e2 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -13,8 +13,6 @@ # include <stdlib.h> # include <string.h> -# include "e_os.h" - # ifdef OPENSSL_USE_APPLINK # undef BIO_FLAGS_UPLINK # define BIO_FLAGS_UPLINK 0x8000 @@ -25,6 +23,7 @@ # include <openssl/buffer.h> # include <openssl/bio.h> # include <openssl/err.h> +# include "internal/nelem.h" #ifdef __cplusplus extern "C" { |