diff --git a/lib/core/locks.nim b/lib/core/locks.nim index 6f139c7a2c..6de22ee721 100644 --- a/lib/core/locks.nim +++ b/lib/core/locks.nim @@ -15,7 +15,7 @@ ## to release its locks should it be part of a deadlock. This thread then ## re-acquires its locks and proceeds. -include "lib/system/syslocks" +include "system/syslocks" type TLock* = TSysLock ## Nimrod lock; whether this is re-entrant diff --git a/lib/windows/shellapi.nim b/lib/windows/shellapi.nim index 17b16fdbd8..da31591764 100755 --- a/lib/windows/shellapi.nim +++ b/lib/windows/shellapi.nim @@ -105,7 +105,7 @@ proc ShellAbout*(HWND: hWnd, szApp: LPCSTR, szOtherStuff: LPCSTR, HICON: hIcon): stdcall, dynlib: "shell32.dll", importc: "ShellAboutA".} proc ShellAbout*(HWND: hWnd, szApp: LPCWSTR, szOtherStuff: LPCWSTR, HICON: hIcon): int32{. stdcall, dynlib: "shell32.dll", importc: "ShellAboutW".} -proc DuplicateIcon*(hinst: HINST, HICON: hIcon): HIcon{.stdcall, +proc DuplicateIcon*(inst: HINST, icon: HICON): HIcon{.stdcall, dynlib: "shell32.dll", importc: "DuplicateIcon".} proc ExtractAssociatedIconA*(hInst: HINST, lpIconPath: LPSTR, lpiIcon: LPWORD): HICON{. stdcall, dynlib: "shell32.dll", importc: "ExtractAssociatedIconA".} diff --git a/tests/compile/tslurp.nim b/tests/compile/tslurp.nim index c99fefe230..f9456ce6bd 100644 --- a/tests/compile/tslurp.nim +++ b/tests/compile/tslurp.nim @@ -1,6 +1,6 @@ const - myRes = slurp"readme.txt" + myRes = slurp"../../readme.txt" echo myRes