diff options
| author | Richard Levitte <levitte@openssl.org> | 2024-04-10 10:18:46 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2024-04-11 13:06:49 +0200 |
| commit | 491bbb444c4b654de14adc7031eb44e88a101edb (patch) | |
| tree | 2d1ec305d39ed8dafd5a603d9462bbd9dbb96425 | |
| parent | crypto/provider_core.c: Allocate activatecnt_lock (diff) | |
| download | openssl-491bbb444c4b654de14adc7031eb44e88a101edb.tar.xz openssl-491bbb444c4b654de14adc7031eb44e88a101edb.zip | |
VMS: Move defining _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED to config target
For all other platforms that need these macros defined, that's how it's
done, so we have VMS follow suit. That avoids a crash between in source
definitions and command line definitions on some other platforms.
Fixes #24075
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24083)
(cherry picked from commit 7f04bb065d9d948d049ef1ef1bd4062cb7831392)
| -rw-r--r-- | Configurations/10-main.conf | 2 | ||||
| -rw-r--r-- | crypto/asn1/a_time.c | 2 | ||||
| -rw-r--r-- | crypto/conf/conf_lib.c | 2 | ||||
| -rw-r--r-- | crypto/conf/conf_sap.c | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index c9db9aac28..ac30adc2c9 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -2054,7 +2054,7 @@ my %targets = ( ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }), cflag_incfirst => '/FIRST_INCLUDE=', lib_defines => - add("OPENSSL_USE_NODELETE", + add("OPENSSL_USE_NODELETE", "_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED", sub { return vms_info()->{def_zlib} ? "LIBZ=\"\"\"".vms_info()->{def_zlib}."\"\"\"" : (); diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 49548235ad..96ee63d310 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -14,8 +14,6 @@ * generalTime GeneralizedTime } */ -#define _XOPEN_SOURCE /* To get a definition of timezone */ - #include <stdio.h> #include <time.h> #include "crypto/asn1.h" diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 13e2723f80..99e9f8c987 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -7,8 +7,6 @@ * https://www.openssl.org/source/license.html */ -#define _XOPEN_SOURCE_EXTENDED /* To get a definition of strdup() */ - #include "internal/e_os.h" #include <stdio.h> #include <string.h> diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 9c78f46581..3019bcf31a 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -7,8 +7,6 @@ * https://www.openssl.org/source/license.html */ -#define _XOPEN_SOURCE_EXTENDED /* To get a definition of strdup() */ - #include <stdio.h> #include <openssl/crypto.h> #include "internal/cryptlib.h" |