Merge branch 'devel' of https://github.com/Araq/Nimrod into devel

This commit is contained in:
Araq 2014-08-14 02:44:53 +02:00
commit c812a616b2

View file

@ -967,11 +967,11 @@ proc genMainProc(m: BModule) =
# functions, which might otherwise merge their stack frames. # functions, which might otherwise merge their stack frames.
NimMainBody = NimMainBody =
"N_CDECL(void, NimMainInner)(void) {$N" & "N_CDECL(void, NimMainInner)(void) {$N" &
"\tPreMain();$N" &
"$1" & "$1" &
"}$N$N" & "}$N$N" &
"N_CDECL(void, NimMain)(void) {$N" & "N_CDECL(void, NimMain)(void) {$N" &
"\tvoid (*volatile inner)();$N" & "\tvoid (*volatile inner)();$N" &
"\tPreMain();$N" &
"\tinner = NimMainInner;$N" & "\tinner = NimMainInner;$N" &
"$2" & "$2" &
"\t(*inner)();$N" & "\t(*inner)();$N" &