diff options
author | Zahary Karadjov <zahary@gmail.com> | 2013-01-28 00:47:41 +0200 |
---|---|---|
committer | Zahary Karadjov <zahary@gmail.com> | 2013-01-28 00:47:41 +0200 |
commit | 0cb95891d353d79cd50cb6f4eb83c9ca03a5a2ca (patch) | |
tree | 9949414ecd5df877f303a236b1b983b9ab3887bf /lib | |
parent | 19e795e0177889fa1a5898ce0469f79a47a3dd73 (diff) | |
download | Nim-0cb95891d353d79cd50cb6f4eb83c9ca03a5a2ca.tar.gz |
fixes nimrtl compilation
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/nimbase.h | 4 | ||||
-rw-r--r-- | lib/system/embedded.nim | 2 | ||||
-rwxr-xr-x | lib/system/excpt.nim | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/nimbase.h b/lib/nimbase.h index 573ad16f7..4735cbb4f 100755 --- a/lib/nimbase.h +++ b/lib/nimbase.h @@ -438,11 +438,11 @@ struct TFrame { #define nimfr(proc, file) \ volatile TFrame F; \ - F.procname = proc; F.filename = file; F.line = 0; F.len = 0; pushFrame(&F); + F.procname = proc; F.filename = file; F.line = 0; F.len = 0; nimFrame(&F); #define nimfrs(proc, file, slots) \ volatile struct {TFrame* prev;NCSTRING procname;NI line;NCSTRING filename; NI len; TVarSlot s[slots];} F; \ - F.procname = proc; F.filename = file; F.line = 0; F.len = slots; pushFrame((TFrame*)&F); + F.procname = proc; F.filename = file; F.line = 0; F.len = slots; nimFrame((TFrame*)&F); #define nimln(n, file) \ F.line = n; F.filename = file; diff --git a/lib/system/embedded.nim b/lib/system/embedded.nim index f17432561..aaa3befaa 100644 --- a/lib/system/embedded.nim +++ b/lib/system/embedded.nim @@ -17,7 +17,7 @@ proc chckRange(i, a, b: int): int {.inline, compilerproc.} proc chckRangeF(x, a, b: float): float {.inline, compilerproc.} proc chckNil(p: pointer) {.inline, compilerproc.} -proc pushFrame(s: PFrame) {.compilerRtl, inl.} = nil +proc pushFrame(s: PFrame) {.compilerRtl, inl, exportc: "nimFrame".} = nil proc popFrame {.compilerRtl, inl.} = nil proc setFrame(s: PFrame) {.compilerRtl, inl.} = nil diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim index 9fbdecbb2..faaefe083 100755 --- a/lib/system/excpt.nim +++ b/lib/system/excpt.nim @@ -41,7 +41,7 @@ var # a global variable for the root of all try blocks currException {.rtlThreadVar.}: ref E_Base -proc pushFrame(s: PFrame) {.compilerRtl, inl.} = +proc pushFrame(s: PFrame) {.compilerRtl, inl, exportc: "nimFrame".} = s.prev = framePtr framePtr = s |