Skip to content

Commit

Permalink
Revert "openssl: don't define SIXTY_FOUR_BIT_LONG on Windows"
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
bnoordhuis authored and piscisaureus committed Dec 9, 2014
1 parent 878cc3e commit 4ccc5a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion deps/openssl/config/opensslconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
# undef SIXTEEN_BIT
# undef EIGHT_BIT
# if defined(_M_X64) || defined(__x86_64__)
# if !defined(_WIN32) && !defined(_LP64)
# if defined(_WIN64) || defined(_LP64)
# define SIXTY_FOUR_BIT_LONG
# else
# define SIXTY_FOUR_BIT
Expand Down

0 comments on commit 4ccc5a6

Please sign in to comment.