diff options
author | Brent Cook <buster@gmail.com> | 2023-03-15 17:33:08 -0600 |
---|---|---|
committer | Brent Cook <buster@gmail.com> | 2023-03-15 18:49:29 -0600 |
commit | 977be09d69a9f9b7eaf85dbd83465c0ec8361598 (patch) | |
tree | 2955551a974a3a54b4593236ae202731b0ea0a8c /patches/crypto_namespace.h.patch | |
parent | 047fddbee9f34c16a82e66ecbe1058bb8810e82f (diff) | |
download | portable-977be09d69a9f9b7eaf85dbd83465c0ec8361598.tar.gz portable-977be09d69a9f9b7eaf85dbd83465c0ec8361598.tar.bz2 portable-977be09d69a9f9b7eaf85dbd83465c0ec8361598.zip |
Fix build for MSVC
Diffstat (limited to 'patches/crypto_namespace.h.patch')
-rw-r--r-- | patches/crypto_namespace.h.patch | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/patches/crypto_namespace.h.patch b/patches/crypto_namespace.h.patch index 2751524..171e7f5 100644 --- a/patches/crypto_namespace.h.patch +++ b/patches/crypto_namespace.h.patch | |||
@@ -1,13 +1,22 @@ | |||
1 | --- crypto/hidden/crypto_namespace.h.orig 2023-02-28 00:41:43.212756628 -0600 | 1 | --- openbsd/src/lib/libcrypto/hidden/crypto_namespace.h 2023-03-15 11:41:37.614024500 -0600 |
2 | +++ crypto/hidden/crypto_namespace.h 2023-02-28 00:42:01.152756349 -0600 | 2 | +++ crypto/hidden/crypto_namespace.h 2023-03-15 17:12:55.297157400 -0600 |
3 | @@ -18,6 +18,10 @@ | 3 | @@ -24,6 +24,12 @@ |
4 | #ifndef _LIBCRYPTO_CRYPTO_NAMESPACE_H_ | 4 | * external calls use the latter name. |
5 | #define _LIBCRYPTO_CRYPTO_NAMESPACE_H_ | 5 | */ |
6 | 6 | ||
7 | +#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__) | 7 | +#ifdef _MSC_VER |
8 | +#define __attribute__(a) | 8 | +# define LCRYPTO_UNUSED(x) |
9 | +#endif | 9 | +# define LCRYPTO_USED(x) |
10 | + | 10 | +# define LCRYPTO_ALIAS1(pre, x) |
11 | /* | 11 | +# define LCRYPTO_ALIAS(x) |
12 | * If marked as 'used', then internal calls use the name with prefix "_lcry_" | 12 | +#else |
13 | * and we alias that to the normal name *and* the name with prefix "_libre_"; | 13 | #ifdef LIBRESSL_NAMESPACE |
14 | # define LCRYPTO_UNUSED(x) typeof(x) x __attribute__((deprecated)) | ||
15 | #ifdef LIBRESSL_CRYPTO_NAMESPACE | ||
16 | @@ -40,5 +46,6 @@ | ||
17 | # define LCRYPTO_ALIAS1(pre,x) | ||
18 | # define LCRYPTO_ALIAS(x) asm("") | ||
19 | #endif | ||
20 | +#endif /* _MSC_VER */ | ||
21 | |||
22 | #endif /* _LIBCRYPTO_CRYPTO_NAMESPACE_H_ */ | ||