diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2014-05-24 01:35:58 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2014-05-24 01:35:58 +0200 |
commit | b9b45c1bb447304b8b0a06dd80de2d1dd8ff58fc (patch) | |
tree | 2471760a79cf28adf984b78674d6ac4c89c6d692 /lib | |
parent | c6c7c651e6c76754b19ed41f37c4e49f285be937 (diff) | |
parent | 46d4e5d052f43a1e2d7e93ef2cf431b0a0201ee5 (diff) | |
download | Nim-b9b45c1bb447304b8b0a06dd80de2d1dd8ff58fc.tar.gz |
Merge pull request #1180 from barcharcraz/OpenBSDFix
Added define check for openBSD around fmtmsg.h stuff
Diffstat (limited to 'lib')
-rw-r--r-- | lib/posix/posix.nim | 4 | ||||
-rw-r--r-- | lib/pure/sockets.nim | 2 | ||||
-rw-r--r-- | lib/wrappers/openssl.nim | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/posix/posix.nim b/lib/posix/posix.nim index e206447cc..cdca826ca 100644 --- a/lib/posix/posix.nim +++ b/lib/posix/posix.nim @@ -846,7 +846,7 @@ var FE_UPWARD* {.importc, header: "<fenv.h>".}: cint FE_DFL_ENV* {.importc, header: "<fenv.h>".}: cint -when not defined(haiku): +when not defined(haiku) and not defined(OpenBSD): var MM_HARD* {.importc, header: "<fmtmsg.h>".}: cint ## Source of the condition is hardware. @@ -1816,7 +1816,7 @@ proc feholdexcept*(a1: ptr Tfenv): cint {.importc, header: "<fenv.h>".} proc fesetenv*(a1: ptr Tfenv): cint {.importc, header: "<fenv.h>".} proc feupdateenv*(a1: ptr Tfenv): cint {.importc, header: "<fenv.h>".} -when not defined(haiku): +when not defined(haiku) and not defined(OpenBSD): proc fmtmsg*(a1: int, a2: cstring, a3: cint, a4, a5, a6: cstring): cint {.importc, header: "<fmtmsg.h>".} diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim index 8d96cbaaf..7b8b3d557 100644 --- a/lib/pure/sockets.nim +++ b/lib/pure/sockets.nim @@ -295,7 +295,7 @@ when defined(ssl): of protSSLv23: newCTX = SSL_CTX_new(SSLv23_method()) # SSlv2,3 and TLS1 support. of protSSLv2: - when not defined(linux): + when not defined(linux) and not defined(OpenBSD): newCTX = SSL_CTX_new(SSLv2_method()) else: SSLError() diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim index 90c398dce..bbcb2175e 100644 --- a/lib/wrappers/openssl.nim +++ b/lib/wrappers/openssl.nim @@ -270,7 +270,7 @@ proc OPENSSL_config*(configName: cstring){.cdecl, dynlib: DLLSSLName, importc.} when not defined(windows): proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, - dynlib: DLLSSLName, importc.} + dynlib: DLLUtilName, importc.} proc CRYPTO_malloc_init*() = when not defined(windows): |