aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorViktor Szakats <commit@vsz.me>2023-11-08 02:09:32 +0000
committerViktor Szakats <commit@vsz.me>2023-11-08 02:13:45 +0000
commit43cb91c947421c2dba6bc2f2104aa0b5aec80006 (patch)
tree5b50ce3f3c6b79e9ee7b5b088f3d246d6f1b0b68 /patches
parentb16146e09b07d939cf028f7f431ef34dc013ebaf (diff)
downloadportable-43cb91c947421c2dba6bc2f2104aa0b5aec80006.tar.gz
portable-43cb91c947421c2dba6bc2f2104aa0b5aec80006.tar.bz2
portable-43cb91c947421c2dba6bc2f2104aa0b5aec80006.zip
amd64/bn_arch.h: avoid redefinition of `OPENSSL_NO_ASM`
Fixes this warning when `OPENSSL_NO_ASM` is already set by the build system (seen with CMake): ``` In file included from ./libressl/crypto/bn/bn_mul.c:65: ./libressl/crypto/bn/arch/amd64/bn_arch.h:24:9: warning: 'OPENSSL_NO_ASM' macro redefined [-Wmacro-redefined] ^ <command line>:10:9: note: previous definition is here ^ ``` Reported in #910
Diffstat (limited to 'patches')
-rw-r--r--patches/win32_amd64_bn_arch.h.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/patches/win32_amd64_bn_arch.h.patch b/patches/win32_amd64_bn_arch.h.patch
index 20205dc..ad7c89d 100644
--- a/patches/win32_amd64_bn_arch.h.patch
+++ b/patches/win32_amd64_bn_arch.h.patch
@@ -1,17 +1,19 @@
1--- crypto/bn/arch/amd64/bn_arch.h.orig 2023-02-27 04:43:12.257874699 -0600 1--- crypto/bn/arch/amd64/bn_arch.h.orig 2023-02-27 04:43:12.257874699 -0600
2+++ crypto/bn/arch/amd64/bn_arch.h 2023-02-27 04:44:05.541873870 -0600 2+++ crypto/bn/arch/amd64/bn_arch.h 2023-02-27 04:44:05.541873870 -0600
3@@ -20,6 +20,10 @@ 3@@ -20,6 +20,12 @@
4 #ifndef HEADER_BN_ARCH_H 4 #ifndef HEADER_BN_ARCH_H
5 #define HEADER_BN_ARCH_H 5 #define HEADER_BN_ARCH_H
6 6
7+#ifdef _WIN32 7+#ifdef _WIN32
8+#ifndef OPENSSL_NO_ASM
8+#define OPENSSL_NO_ASM 9+#define OPENSSL_NO_ASM
10+#endif
9+#else 11+#else
10+ 12+
11 #ifndef OPENSSL_NO_ASM 13 #ifndef OPENSSL_NO_ASM
12 14
13 #define HAVE_BN_ADD 15 #define HAVE_BN_ADD
14@@ -85,6 +89,7 @@ 16@@ -85,6 +91,7 @@
15 *out_r0 = r0; 17 *out_r0 = r0;
16 } 18 }
17 #endif /* __GNUC__ */ 19 #endif /* __GNUC__ */