Mercurial > projects > ldc
diff dmd/template.c @ 285:297690b5d4a5 trunk
[svn r306] Fixed: it's now possible to compile and link llvmdc with MinGW32 and msys on Win32 :D I tried it myself ;) Building the runtime still needs some work, but it's a step in the right direction.
| author | lindquist |
|---|---|
| date | Sat, 21 Jun 2008 03:14:49 +0200 |
| parents | 5acec6b2eef8 |
| children | 2b72433d5c8c |
line wrap: on
line diff
--- a/dmd/template.c Sat Jun 21 02:48:53 2008 +0200 +++ b/dmd/template.c Sat Jun 21 03:14:49 2008 +0200 @@ -13,15 +13,18 @@ #include <stdio.h> #include <assert.h> +#if !IN_LLVM #if _WIN32 #include <windows.h> long __cdecl __ehfilter(LPEXCEPTION_POINTERS ep); #endif +#endif #include "root.h" #include "mem.h" #include "stringtable.h" - +#include "mars.h" +#include "identifier.h" #include "mtype.h" #include "template.h" #include "init.h" @@ -31,9 +34,6 @@ #include "aggregate.h" #include "declaration.h" #include "dsymbol.h" -#include "mars.h" -#include "dsymbol.h" -#include "identifier.h" #include "hdrgen.h" #define LOG 0 @@ -2944,10 +2944,12 @@ //printf("isnested = %d, sc->parent = %s\n", isnested, sc->parent->toChars()); sc2->parent = /*isnested ? sc->parent :*/ this; +#if !IN_LLVM #if _WIN32 __try { #endif +#endif for (int i = 0; i < members->dim; i++) { Dsymbol *s = (Dsymbol *)members->data[i]; @@ -2960,6 +2962,7 @@ //printf("test4: isnested = %d, s->parent = %s\n", isnested, s->parent->toChars()); sc2->module->runDeferredSemantic(); } +#if !IN_LLVM #if _WIN32 } __except (__ehfilter(GetExceptionInformation())) @@ -2969,6 +2972,7 @@ fatal(); } #endif +#endif /* If any of the instantiation members didn't get semantic() run * on them due to forward references, we cannot run semantic2()