diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2015-03-12 16:17:47 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2015-03-12 16:17:47 +0100 |
| commit | 4051e436b680d5cb24f0c662820a56ccbc57704c (patch) | |
| tree | 8e8f8ee77c6cc15bfc4be20e6c524ae4f82f9b9e | |
| parent | 45a7c51f0c252c8617f52f78c48ef1fd1009f021 (diff) | |
| parent | 3ccf667899b1358f50588fe69b2afa65de59f668 (diff) | |
| download | Nim-4051e436b680d5cb24f0c662820a56ccbc57704c.tar.gz | |
Merge pull request #2320 from aurora/ssl-sigsegv
openssl: do not set mem functions on osx
| -rw-r--r-- | lib/wrappers/openssl.nim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim index bca7b3a40..03729dbab 100644 --- a/lib/wrappers/openssl.nim +++ b/lib/wrappers/openssl.nim @@ -298,7 +298,7 @@ when not useWinVersion: if p != nil: dealloc(p) proc CRYPTO_malloc_init*() = - when not useWinVersion: + when not useWinVersion and not defined(macosx): CRYPTO_set_mem_functions(allocWrapper, reallocWrapper, deallocWrapper) proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cInt, larg: int, parg: pointer): int{. |