diff options
| author | tb <> | 2025-08-18 16:00:53 +0000 |
|---|---|---|
| committer | tb <> | 2025-08-18 16:00:53 +0000 |
| commit | 2e7e54d39b2c2daad577d5ebd98d8a826edc4703 (patch) | |
| tree | 6fb3e7dbf8a58ee8633c9c1a31d78ea147bfaf42 | |
| parent | 7bb5d534c2961734465b2d9635a531ab902567e4 (diff) | |
| download | openbsd-2e7e54d39b2c2daad577d5ebd98d8a826edc4703.tar.gz openbsd-2e7e54d39b2c2daad577d5ebd98d8a826edc4703.tar.bz2 openbsd-2e7e54d39b2c2daad577d5ebd98d8a826edc4703.zip | |
sync with crypto_namespace.h: avoid asm("") for MSVC
Removes another patch in portable
| -rw-r--r-- | src/lib/libssl/hidden/ssl_namespace.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libssl/hidden/ssl_namespace.h b/src/lib/libssl/hidden/ssl_namespace.h index 5d26516f3c..763dcd700f 100644 --- a/src/lib/libssl/hidden/ssl_namespace.h +++ b/src/lib/libssl/hidden/ssl_namespace.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_namespace.h,v 1.3 2024/07/12 05:26:34 miod Exp $ */ | 1 | /* $OpenBSD: ssl_namespace.h,v 1.4 2025/08/18 16:00:53 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> | 3 | * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> |
| 4 | * | 4 | * |
| @@ -35,7 +35,11 @@ | |||
| 35 | #else | 35 | #else |
| 36 | #define LSSL_UNUSED(x) | 36 | #define LSSL_UNUSED(x) |
| 37 | #define LSSL_USED(x) | 37 | #define LSSL_USED(x) |
| 38 | #ifdef _MSC_VER | ||
| 39 | #define LSSL_ALIAS(x) | ||
| 40 | #else | ||
| 38 | #define LSSL_ALIAS(x) asm("") | 41 | #define LSSL_ALIAS(x) asm("") |
| 42 | #endif /* _MSC_VER */ | ||
| 39 | #endif | 43 | #endif |
| 40 | 44 | ||
| 41 | #endif /* _LIBSSL_SSL_NAMESPACE_H_ */ | 45 | #endif /* _LIBSSL_SSL_NAMESPACE_H_ */ |
