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 | |
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)
93 files changed, 93 insertions, 93 deletions
diff --git a/apps/include/apps.h b/apps/include/apps.h index b6dbe74fa9..28c2bbdad2 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/common.h" /* for HAS_PREFIX */ # include "internal/nelem.h" # include "internal/sockets.h" /* for openssl_fdset() */ diff --git a/apps/s_client.c b/apps/s_client.c index 1d73e1b39e..06a58a8b51 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> diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 031a6c936a..9704492607 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -10,7 +10,7 @@ /* We need to use some engine deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED -#include "e_os.h" /* for strncasecmp */ +#include "internal/e_os.h" /* for strncasecmp */ #include "internal/cryptlib.h" #include <stdio.h> #include <openssl/asn1t.h> diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index bb0dcb2e09..a112f7de9e 100644 --- a/crypto/asn1/asn1_gen.c +++ b/crypto/asn1/asn1_gen.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include <openssl/asn1.h> #include <openssl/x509v3.h> -#include "e_os.h" /* strncasecmp() */ +#include "internal/e_os.h" /* strncasecmp() */ #define ASN1_GEN_FLAG 0x10000 #define ASN1_GEN_FLAG_IMP (ASN1_GEN_FLAG|1) diff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h index 749e8f810c..6ba0196ce6 100644 --- a/crypto/bio/bio_local.h +++ b/crypto/bio/bio_local.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/sockets.h" /* BEGIN BIO_ADDRINFO/BIO_ADDR stuff. */ diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c index 92dd262309..aaac451314 100644 --- a/crypto/bio/bss_bio.c +++ b/crypto/bio/bss_bio.c @@ -15,7 +15,7 @@ * See ssl/ssltest.c for some hints on how this can be used. */ -#include "e_os.h" +#include "internal/e_os.h" #include <assert.h> #include <limits.h> #include <stdlib.h> diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index 4a7a87ff74..0ca7f94a86 100644 --- a/crypto/cmp/cmp_client.c +++ b/crypto/cmp/cmp_client.c @@ -11,7 +11,7 @@ #include "cmp_local.h" #include "internal/cryptlib.h" -#include "e_os.h" /* ossl_sleep() */ +#include "internal/e_os.h" /* ossl_sleep() */ /* explicit #includes not strictly needed since implied by the above: */ #include <openssl/bio.h> 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" diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c index 6cb0ec5a06..f058e629f3 100644 --- a/crypto/core_namemap.c +++ b/crypto/core_namemap.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include "internal/namemap.h" #include <openssl/lhash.h> #include "crypto/lhash.h" /* ossl_lh_strcasehash */ diff --git a/crypto/cpuid.c b/crypto/cpuid.c index 048689f410..75bd03bffe 100644 --- a/crypto/cpuid.c +++ b/crypto/cpuid.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "crypto/cryptlib.h" #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 6e73b8352c..f78c2236e4 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -8,7 +8,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "crypto/cryptlib.h" #include <openssl/safestack.h> diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c index 30458d50a1..e8813755bf 100644 --- a/crypto/des/cfb_enc.c +++ b/crypto/des/cfb_enc.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include "e_os.h" +#include "internal/e_os.h" #include "des_local.h" #include <assert.h> diff --git a/crypto/dh/dh_group_params.c b/crypto/dh/dh_group_params.c index c71f4053da..dec50caf66 100644 --- a/crypto/dh/dh_group_params.c +++ b/crypto/dh/dh_group_params.c @@ -23,7 +23,7 @@ #include <openssl/objects.h> #include "internal/nelem.h" #include "crypto/dh.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ static DH *dh_param_init(OSSL_LIB_CTX *libctx, const DH_NAMED_GROUP *group) { diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index 419e7711d3..eda3d3998a 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c @@ -13,8 +13,8 @@ */ #include "internal/deprecated.h" -#include "e_os.h" -#include "e_os.h" +#include "internal/e_os.h" +#include "internal/e_os.h" #include <string.h> #include <openssl/core_names.h> #include <openssl/dh.h> diff --git a/crypto/dllmain.c b/crypto/dllmain.c index 48c0cd3122..65d9be6767 100644 --- a/crypto/dllmain.c +++ b/crypto/dllmain.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "crypto/cryptlib.h" #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index 6a988cc727..982b117e70 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -17,7 +17,7 @@ #endif #include "dso_local.h" -#include "e_os.h" +#include "internal/e_os.h" #ifdef DSO_DLFCN diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 4d3059d438..08ad8f46b3 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "dso_local.h" #if defined(DSO_WIN32) diff --git a/crypto/ec/curve448/arch_32/f_impl32.c b/crypto/ec/curve448/arch_32/f_impl32.c index 8714a51422..45d5587347 100644 --- a/crypto/ec/curve448/arch_32/f_impl32.c +++ b/crypto/ec/curve448/arch_32/f_impl32.c @@ -10,7 +10,7 @@ * Originally written by Mike Hamburg */ -#include "e_os.h" +#include "internal/e_os.h" #include <openssl/macros.h> #include "in |