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

fixes #5143

Browse source
This commit is contained in:
Araq 2017-10-16 12:45:43 +02:00
commit b219fc74ad
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/system/threads.nim
View file

@ -398,7 +398,7 @@ template afterThreadRuns() =
threadDestructionHandlers[i]() threadDestructionHandlers[i]()
when not defined(boehmgc) and not hasSharedHeap and not defined(gogc) and not defined(gcRegions): when not defined(boehmgc) and not hasSharedHeap and not defined(gogc) and not defined(gcRegions):
proc deallocOsPages() proc deallocOsPages() {.rtl.}
when defined(boehmgc): when defined(boehmgc):
type GCStackBaseProc = proc(sb: pointer, t: pointer) {.noconv.} type GCStackBaseProc = proc(sb: pointer, t: pointer) {.noconv.}

6
tests/testament/categories.nim
View file

@ -83,9 +83,9 @@ proc runBasicDLLTest(c, r: var TResults, cat: Category, options: string) =
"" ""
testSpec c, makeTest("lib/nimrtl.nim", testSpec c, makeTest("lib/nimrtl.nim",
options & " --app:lib -d:createNimRtl", cat) options & " --app:lib -d:createNimRtl --threads:on", cat)
testSpec c, makeTest("tests/dll/server.nim", testSpec c, makeTest("tests/dll/server.nim",
options & " --app:lib -d:useNimRtl" & rpath, cat) options & " --app:lib -d:useNimRtl --threads:on" & rpath, cat)
when defined(Windows): when defined(Windows):
@ -101,7 +101,7 @@ proc runBasicDLLTest(c, r: var TResults, cat: Category, options: string) =
var nimrtlDll = DynlibFormat % "nimrtl" var nimrtlDll = DynlibFormat % "nimrtl"
safeCopyFile("lib" / nimrtlDll, "tests/dll" / nimrtlDll) safeCopyFile("lib" / nimrtlDll, "tests/dll" / nimrtlDll)
testSpec r, makeTest("tests/dll/client.nim", options & " -d:useNimRtl" & rpath, testSpec r, makeTest("tests/dll/client.nim", options & " -d:useNimRtl --threads:on" & rpath,
cat, actionRun) cat, actionRun)
proc dllTests(r: var TResults, cat: Category, options: string) = proc dllTests(r: var TResults, cat: Category, options: string) =