diff options
| author | Richard Levitte <levitte@openssl.org> | 2022-02-04 15:13:01 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-11-11 10:03:45 +0100 |
| commit | 97477bb6c485e8b7e755ead7bb2e709c68f45f5f (patch) | |
| tree | 644a9e74d16abd58bdd98a745aa467f7a242d92f /test | |
| parent | 70df6caa0bf198258c657ee472dea47c4727b039 (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)
(cherry picked from commit d5f9166bacfb3757dfd6117310ad54ab749b11f9)
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/helpers/ssltestlib.c | 2 | ||||
| -rw-r--r-- | test/localetest.c | 2 | ||||
| -rw-r--r-- | test/p_test.c | 2 | ||||
| -rw-r--r-- | test/secmemtest.c | 2 | ||||
| -rw-r--r-- | test/ssl_old_test.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/helpers/ssltestlib.c b/test/helpers/ssltestlib.c index 4c17faea54..3b74ddb088 100644 --- a/test/helpers/ssltestlib.c +++ b/test/helpers/ssltestlib.c @@ -12,7 +12,7 @@ #include "internal/nelem.h" #include "ssltestlib.h" #include "../testutil.h" -#include "e_os.h" /* for ossl_sleep() etc. */ +#include "internal/e_os.h" /* for ossl_sleep() etc. */ #ifdef OPENSSL_SYS_UNIX # include <unistd.h> diff --git a/test/localetest.c b/test/localetest.c index 9df90ed901..616356a140 100644 --- a/test/localetest.c +++ b/test/localetest.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 <stdlib.h> diff --git a/test/p_test.c b/test/p_test.c index 80f0784dd9..32a5e44117 100644 --- a/test/p_test.c +++ b/test/p_test.c @@ -26,7 +26,7 @@ # define OSSL_provider_init PROVIDER_INIT_FUNCTION_NAME #endif -#include "e_os.h" +#include "internal/e_os.h" #include <openssl/core.h> #include <openssl/core_dispatch.h> #include <openssl/err.h> diff --git a/test/secmemtest.c b/test/secmemtest.c index d0f9ba2e99..2b0a163747 100644 --- a/test/secmemtest.c +++ b/test/secmemtest.c @@ -10,7 +10,7 @@ #include <openssl/crypto.h> #include "testutil.h" -#include "../e_os.h" +#include "internal/e_os.h" static int test_sec_mem(void) { diff --git a/test/ssl_old_test.c b/test/ssl_old_test.c index 91c8b5b7b5..d09d5ab3a9 100644 --- a/test/ssl_old_test.c +++ b/test/ssl_old_test.c @@ -9,7 +9,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" /* Or gethostname won't be declared properly on Linux and GNU platforms. */ #ifndef _BSD_SOURCE |