Mercurial > projects > ldc
diff dmd/mars.c @ 1630:44b145be2ef5
Merge dmd 1.056.
author | Robert Clipsham <robert@octarineparrot.com> |
---|---|
date | Sat, 06 Feb 2010 15:53:52 +0000 |
parents | 6c36e3f49b28 |
children | 9bf06e02070b |
line wrap: on
line diff
--- a/dmd/mars.c Wed Jan 06 19:53:35 2010 +0100 +++ b/dmd/mars.c Sat Feb 06 15:53:52 2010 +0000 @@ -1,6 +1,6 @@ // Compiler implementation of the D programming language -// Copyright (c) 1999-2009 by Digital Mars +// Copyright (c) 1999-2010 by Digital Mars // All Rights Reserved // written by Walter Bright // http://www.digitalmars.com @@ -13,8 +13,10 @@ #include <ctype.h> #include <assert.h> #include <limits.h> +#if IN_LLVM #include <string> #include <cstdarg> +#endif #if POSIX #include <errno.h> @@ -34,7 +36,9 @@ #include "lexer.h" #include "json.h" +#if IN_LLVM #include "gen/revisions.h" +#endif Global global; @@ -46,6 +50,7 @@ doc_ext = "html"; ddoc_ext = "ddoc"; json_ext = "json"; + map_ext = "map"; // LDC ll_ext = "ll"; @@ -58,7 +63,7 @@ copyright = "Copyright (c) 1999-2009 by Digital Mars and Tomas Lindquist Olsen"; written = "written by Walter Bright and Tomas Lindquist Olsen"; - version = "v1.055"; + version = "v1.056"; ldc_version = LDC_REV; llvm_version = LLVM_REV_STR; global.structalign = 8;