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 /ssl/ssl_conf.c | |
| 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 'ssl/ssl_conf.c')
| -rw-r--r-- | ssl/ssl_conf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 6dd5922a54..1a8dc1543d 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2012-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 @@ -12,6 +12,7 @@ #include <openssl/conf.h> #include <openssl/objects.h> #include <openssl/dh.h> +#include "internal/nelem.h" /* * structure holding name tables. This is used for permitted elements in lists |