summaryrefslogtreecommitdiffstats
path: root/crypto/dso
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-08-18 13:52:46 +1000
committerPauli <paul.dale@oracle.com>2017-08-30 07:20:43 +1000
commit677963e5a428739062ab5d46d5baed5eadd0195d (patch)
tree3afe5ace573d0da8a5272575075ad4aede8dcec5 /crypto/dso
parent58891025eff2fb42a6a5cf2fa861d46308826d07 (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 'crypto/dso')
-rw-r--r--crypto/dso/dso_lib.c3
-rw-r--r--crypto/dso/dso_win32.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index ec3c59ac4d..3645c8d603 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-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
@@ -8,6 +8,7 @@
*/
#include "dso_locl.h"
+#include "e_os.h"
static DSO_METHOD *default_DSO_meth = NULL;
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 829f1b859b..635974be70 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-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
@@ -7,6 +7,7 @@
* https://www.openssl.org/source/license.html
*/
+#include "e_os.h"
#include "dso_locl.h"
#if defined(DSO_WIN32)