jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docgen works on linux

Browse source
This commit is contained in:
Araq 2014-10-27 00:12:36 +01:00
commit 73ff0432dc
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/net.nim
View file

@ -232,10 +232,10 @@ when defined(ssl):
proc socketError*(socket: Socket, err: int = -1, async = false, proc socketError*(socket: Socket, err: int = -1, async = false,
lastError = (-1).OSErrorCode) = lastError = (-1).OSErrorCode) =
## Raises an EOS error based on the error code returned by ``SSLGetError`` ## Raises an OSError based on the error code returned by ``SSLGetError``
## (for SSL sockets) and ``osLastError`` otherwise. ## (for SSL sockets) and ``osLastError`` otherwise.
## ##
## If ``async`` is ``True`` no error will be thrown in the case when the ## If ``async`` is ``true`` no error will be thrown in the case when the
## error was caused by no data being available to be read. ## error was caused by no data being available to be read.
## ##
## If ``err`` is not lower than 0 no exception will be raised. ## If ``err`` is not lower than 0 no exception will be raised.

8
lib/wrappers/openssl.nim
View file

@ -41,7 +41,9 @@
{.deadCodeElim: on.} {.deadCodeElim: on.}
when defined(WINDOWS): const useWinVersion = defined(Windows) or defined(nimdoc)
when useWinVersion:
const const
DLLSSLName = "(ssleay32|libssl32).dll" DLLSSLName = "(ssleay32|libssl32).dll"
DLLUtilName = "libeay32.dll" DLLUtilName = "libeay32.dll"
@ -270,12 +272,12 @@ proc OpenSSL_add_all_algorithms*(){.cdecl, dynlib: DLLUtilName, importc: "OPENSS
proc OPENSSL_config*(configName: cstring){.cdecl, dynlib: DLLSSLName, importc.} proc OPENSSL_config*(configName: cstring){.cdecl, dynlib: DLLSSLName, importc.}
when not defined(windows): when not useWinVersion:
proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl,
dynlib: DLLUtilName, importc.} dynlib: DLLUtilName, importc.}
proc CRYPTO_malloc_init*() = proc CRYPTO_malloc_init*() =
when not defined(windows): when not useWinVersion:
CRYPTO_set_mem_functions(alloc, realloc, dealloc) CRYPTO_set_mem_functions(alloc, realloc, dealloc)
proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cInt, larg: int, parg: pointer): int{. proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cInt, larg: int, parg: pointer): int{.