diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-11 23:16:31 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-11 23:16:31 +0200 |
| commit | 925aa086a27fc06d7dacc866fed975046652cf23 (patch) | |
| tree | 2b8b62259a10351b224a43444ff08592f446efff /drivers/builtin_openssl2/openssl/opensslconf.h | |
| parent | 89fcd529f3966a2f4977402f9d8f1ec25dfeb53e (diff) | |
| parent | c860574d8ba246b5e2c59578f24accd2ace5e9bc (diff) | |
Merge pull request #4275 from mrezai/openssl-1.0.1s
Update OpenSSL to version 1.0.1s
Diffstat (limited to 'drivers/builtin_openssl2/openssl/opensslconf.h')
| -rw-r--r-- | drivers/builtin_openssl2/openssl/opensslconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/builtin_openssl2/openssl/opensslconf.h b/drivers/builtin_openssl2/openssl/opensslconf.h index 212c2ede7f..c2aee9d3db 100644 --- a/drivers/builtin_openssl2/openssl/opensslconf.h +++ b/drivers/builtin_openssl2/openssl/opensslconf.h @@ -227,7 +227,7 @@ #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. @@ -246,7 +246,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! 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 */ +#if defined( __sun ) || defined ( sun ) /* Newer Sparc's */ # define DES_PTR # define DES_RISC1 # define DES_UNROLL |