Skip to content

Commit 4ccc5a6

Browse files
bnoordhuispiscisaureus
authored andcommitted
Revert "openssl: don't define SIXTY_FOUR_BIT_LONG on Windows"
This reverts commit 878cc3e. Reverted for breaking the x86_64 Linux build: In file included from ../deps/openssl/openssl/include/openssl/bn.h:1:0, from ../deps/openssl/openssl/crypto/bn/asm/../bn_lcl.h:115, from ../deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c:1: ../deps/openssl/openssl/include/openssl/../../crypto/bn/bn.h:813:20: note: previous declaration of 'bn_add_words' was here BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int num); ^ ../deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c:210:15: error: conflicting types for 'bn_sub_words' BN_ULONG bn_sub_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int n)
1 parent 878cc3e commit 4ccc5a6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

deps/openssl/config/opensslconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
# undef SIXTEEN_BIT
222222
# undef EIGHT_BIT
223223
# if defined(_M_X64) || defined(__x86_64__)
224-
# if !defined(_WIN32) && !defined(_LP64)
224+
# if defined(_WIN64) || defined(_LP64)
225225
# define SIXTY_FOUR_BIT_LONG
226226
# else
227227
# define SIXTY_FOUR_BIT

0 commit comments

Comments
 (0)