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 /crypto/conf | |
| parent | 77f3936928068bee9d7e0c6939709ac179cb1059 (diff) | |
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 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_api.c | 2 | ||||
| -rw-r--r-- | crypto/conf/conf_def.c | 2 | ||||
| -rw-r--r-- | crypto/conf/conf_lib.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 7a4efe6dbb..37e66af78e 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -9,7 +9,7 @@ /* Part of the code in here was originally in conf.c, which is now removed */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/cryptlib.h" #include <stdlib.h> #include <string.h> diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 26764dad00..9d79a900c8 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -11,7 +11,7 @@ #include <stdio.h> #include <string.h> -#include "e_os.h" /* strcasecmp and struct stat */ +#include "internal/e_os.h" /* strcasecmp and struct stat */ #ifdef __TANDEM # include <sys/types.h> /* needed for stat.h */ # include <sys/stat.h> /* struct stat */ diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index a236003525..fe08e0af5f 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_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 <string.h> #include "internal/conf.h" |