diff options
-rw-r--r-- | doc/pegdocs.txt | 2 | ||||
-rw-r--r-- | lib/pure/asyncdispatch.nim | 6 | ||||
-rw-r--r-- | lib/wrappers/linenoise/clinenoise.c (renamed from lib/wrappers/linenoise/linenoise.c) | 2 | ||||
-rw-r--r-- | lib/wrappers/linenoise/clinenoise.h (renamed from lib/wrappers/linenoise/linenoise.h) | 0 | ||||
-rw-r--r-- | lib/wrappers/linenoise/linenoise.nim | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/doc/pegdocs.txt b/doc/pegdocs.txt index 118949cad..fb8569ea6 100644 --- a/doc/pegdocs.txt +++ b/doc/pegdocs.txt @@ -188,7 +188,7 @@ Check if `s` matches Nim's "while" keyword: Exchange (key, val)-pairs: .. code-block:: nim - "key: val; key2: val2".replace(peg"{\ident} \s* ':' \s* {\ident}", "$2: $1") + "key: val; key2: val2".replacef(peg"{\ident} \s* ':' \s* {\ident}", "$2: $1") Determine the ``#include``'ed files of a C file: diff --git a/lib/pure/asyncdispatch.nim b/lib/pure/asyncdispatch.nim index 0b312d4d4..2ce31b4e8 100644 --- a/lib/pure/asyncdispatch.nim +++ b/lib/pure/asyncdispatch.nim @@ -333,7 +333,7 @@ when defined(windows) or defined(nimdoc): ioPort: Handle handles: HashSet[AsyncFD] - CustomOverlapped = object of TOVERLAPPED + CustomOverlapped = object of OVERLAPPED data*: CompletionData PCustomOverlapped* = ref CustomOverlapped @@ -420,12 +420,12 @@ when defined(windows) or defined(nimdoc): var acceptExPtr: pointer = nil var getAcceptExSockAddrsPtr: pointer = nil - proc initPointer(s: SocketHandle, fun: var pointer, guid: var TGUID): bool = + proc initPointer(s: SocketHandle, fun: var pointer, guid: var GUID): bool = # Ref: https://github.com/powdahound/twisted/blob/master/twisted/internet/iocpreactor/iocpsupport/winsock_pointers.c var bytesRet: Dword fun = nil result = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, addr guid, - sizeof(TGUID).Dword, addr fun, sizeof(pointer).Dword, + sizeof(GUID).Dword, addr fun, sizeof(pointer).Dword, addr bytesRet, nil, nil) == 0 proc initAll() = diff --git a/lib/wrappers/linenoise/linenoise.c b/lib/wrappers/linenoise/clinenoise.c index c10557d0e..b4ae32472 100644 --- a/lib/wrappers/linenoise/linenoise.c +++ b/lib/wrappers/linenoise/clinenoise.c @@ -116,7 +116,7 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <unistd.h> -#include "linenoise.h" +#include "clinenoise.h" #define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100 #define LINENOISE_MAX_LINE 4096 diff --git a/lib/wrappers/linenoise/linenoise.h b/lib/wrappers/linenoise/clinenoise.h index fbb01cfaa..fbb01cfaa 100644 --- a/lib/wrappers/linenoise/linenoise.h +++ b/lib/wrappers/linenoise/clinenoise.h diff --git a/lib/wrappers/linenoise/linenoise.nim b/lib/wrappers/linenoise/linenoise.nim index a6260eb12..b7004c6e2 100644 --- a/lib/wrappers/linenoise/linenoise.nim +++ b/lib/wrappers/linenoise/linenoise.nim @@ -14,7 +14,7 @@ type CompletionCallback* = proc (a2: cstring; a3: ptr Completions) {.cdecl.} -{.compile: "linenoise.c".} +{.compile: "clinenoise.c".} proc setCompletionCallback*(a2: ptr CompletionCallback) {. importc: "linenoiseSetCompletionCallback".} |