diff options
author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-07-09 22:00:23 +0900 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-07-09 18:24:26 +0200 |
commit | c70e68fa325c31874d4ac8c48e5e3857915c1807 (patch) | |
tree | 79f751cb94d96c8d47ee7f117605f8ee615d4f10 /deps/openssl/config/archs/VC-WIN32 | |
parent | ca93f7f2e646127f25b99501ce683158b274713e (diff) | |
download | android-node-v8-c70e68fa325c31874d4ac8c48e5e3857915c1807.tar.gz android-node-v8-c70e68fa325c31874d4ac8c48e5e3857915c1807.tar.bz2 android-node-v8-c70e68fa325c31874d4ac8c48e5e3857915c1807.zip |
deps: update deps/openssl/conf/arch/*/opensslconf.h
They should be updated according to the fix at
https://github.com/openssl/openssl/commit/b4f0d1a4a89b964dba80036a6348ca0a1913c526
PR-URL: https://github.com/nodejs/io.js/pull/2141
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/config/archs/VC-WIN32')
-rw-r--r-- | deps/openssl/config/archs/VC-WIN32/opensslconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/openssl/config/archs/VC-WIN32/opensslconf.h b/deps/openssl/config/archs/VC-WIN32/opensslconf.h index 5f76519d82..515a515741 100644 --- a/deps/openssl/config/archs/VC-WIN32/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN32/opensslconf.h @@ -203,7 +203,7 @@ extern "C" { #endif #if defined(DES_RISC1) && defined(DES_RISC2) -YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! +#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! #endif /* Unroll the inner loop, this sometimes helps, sometimes hinders. @@ -221,7 +221,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! even newer MIPS CPU's, but at the moment one size fits all for optimization options. Older Sparc's work better with only UNROLL, but there's no way to tell at compile time what it is you're running on */ - + #if defined( sun ) /* Newer Sparc's */ # define DES_PTR # define DES_RISC1 |