diff options
| author | Richard Levitte <levitte@openssl.org> | 2022-02-04 15:13:01 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2022-02-05 05:31:09 +0100 |
| commit | d5f9166bacfb3757dfd6117310ad54ab749b11f9 (patch) | |
| tree | 2ee6532788cf791a75e7e658ab8b9709c1d8ee62 /ssl | |
| parent | 77f3936928068bee9d7e0c6939709ac179cb1059 (diff) | |
| download | openssl-new-d5f9166bacfb3757dfd6117310ad54ab749b11f9.tar.gz | |
Move e_os.h to include/internal
Including e_os.h with a path from a header file doesn't work well on
certain exotic platform. It simply fails to build.
Since we don't seem to be able to stop ourselves, the better move is
to move e_os.h to an include directory that's part of the inclusion
path given to the compiler.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17641)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/d1_lib.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_init.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_local.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index 95a34093c9..baedf390f6 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include <stdio.h> #include <openssl/objects.h> #include <openssl/rand.h> diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index e996a803e0..6a666ac0e7 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/err.h" #include <openssl/crypto.h> diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index cb7a52ab7e..9138cd659b 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -11,7 +11,7 @@ #include <stdio.h> #include "ssl_local.h" -#include "e_os.h" +#include "internal/e_os.h" #include <openssl/objects.h> #include <openssl/x509v3.h> #include <openssl/rand.h> diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 2c83505660..58a3e9e08a 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -12,7 +12,7 @@ #ifndef OSSL_SSL_LOCAL_H # define OSSL_SSL_LOCAL_H -# include "e_os.h" /* struct timeval for DTLS */ +# include "internal/e_os.h" /* struct timeval for DTLS */ # include <stdlib.h> # include <time.h> # include <errno.h> |