diff dmd/cond.c @ 1195:e961851fb8be

Merged DMD 1.042.
author Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
date Fri, 03 Apr 2009 17:59:34 +0200
parents b30fe7e1dbb9
children 8026319762be
line wrap: on
line diff
--- a/dmd/cond.c	Fri Apr 03 17:02:52 2009 +0200
+++ b/dmd/cond.c	Fri Apr 03 17:59:34 2009 +0200
@@ -129,7 +129,14 @@
     {
 	"DigitalMars", "X86", "X86_64",
 	"Windows", "Win32", "Win64",
-	"linux", "Posix", "OSX", "FreeBSD",
+	"linux",
+#if DMDV2
+	/* Although Posix is predefined by D1, disallowing its
+	 * redefinition breaks makefiles and older builds.
+	 */
+	"Posix",
+#endif
+	"OSX", "FreeBSD",
 	"LittleEndian", "BigEndian",
 	"all",
 	"none",