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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/include/apps.h | 2 | ||||
| -rw-r--r-- | apps/s_client.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/include/apps.h b/apps/include/apps.h index baacd0025d..8b96fa7235 100644 --- a/apps/include/apps.h +++ b/apps/include/apps.h @@ -10,7 +10,7 @@ #ifndef OSSL_APPS_H # define OSSL_APPS_H -# include "e_os.h" /* struct timeval for DTLS */ +# include "internal/e_os.h" /* struct timeval for DTLS */ # include "internal/nelem.h" # include "internal/sockets.h" /* for openssl_fdset() */ # include "internal/cryptlib.h" /* ossl_assert() */ diff --git a/apps/s_client.c b/apps/s_client.c index 182f7d9ddb..1d99ba3824 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -8,7 +8,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include <ctype.h> #include <stdio.h> #include <stdlib.h> |