Mercurial > projects > ddmd
diff dmd/backend/glue.d @ 25:3f834bed4f13
FWindows linking issues fixed
author | korDen |
---|---|
date | Tue, 13 Apr 2010 00:38:04 +0400 |
parents | 5c9b78899f5d |
children | 544b922227c7 |
line wrap: on
line diff
--- a/dmd/backend/glue.d Mon Apr 12 17:02:32 2010 +0100 +++ b/dmd/backend/glue.d Tue Apr 13 00:38:04 2010 +0400 @@ -20,12 +20,22 @@ __gshared Array obj_symbols_towrite; -extern (C++) /+extern+/ -{ - extern(C) extern __gshared Outbuffer objbuf; - int go_flag(char* cp); - void util_set64(); - void util_set386(); +version (Windows) { + extern (C++) extern + { + __gshared Outbuffer objbuf; + int go_flag(char* cp); + void util_set64(); + void util_set386(); + } +} else { + extern (C++) /+extern+/ + { + extern(C) extern __gshared Outbuffer objbuf; + int go_flag(char* cp); + void util_set64(); + void util_set386(); + } } import std.contracts; @@ -279,7 +289,9 @@ } else { - void obj_init(Outbuffer* objbuf, const(char)* filename, const(char)* csegname); + extern (C++) { + void obj_init(Outbuffer* objbuf, const(char)* filename, const(char)* csegname); + } } extern (C++) {