From 2fc1d0c104d5ef5a8121feacf0cac2dd32fb2bb5 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 5 Mar 2008 17:40:54 +0000 Subject: INTEGRATION: CWS dmake412_DEV300 (1.4.26); FILE MERGED 2007/11/12 00:12:02 vq 1.4.26.2: #i83540# Make dmake buildable with .NET 2003 again. 2007/11/11 23:05:49 vq 1.4.26.1: #i83540# Enable parallel builds with native W32 dmake. (First MinGW only.) --- dmake/win95/microsft/ruletab.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dmake/win95/microsft/ruletab.c b/dmake/win95/microsft/ruletab.c index 494d2f132f4d..12edbeb84de7 100644 --- a/dmake/win95/microsft/ruletab.c +++ b/dmake/win95/microsft/ruletab.c @@ -1,4 +1,4 @@ -/* RCS $Id: ruletab.c,v 1.4 2006-06-29 11:32:26 ihi Exp $ +/* RCS $Id: ruletab.c,v 1.5 2008-03-05 18:40:54 kz Exp $ -- -- SYNOPSIS -- Default initial configuration of dmake. @@ -29,12 +29,20 @@ * may be overridden inside the .STARTUP makefile, they are here * strictly so that dmake can parse the STARTUP makefile */ -#include +#include "extern.h" + +#if !defined(MAXIMUM_WAIT_OBJECTS) +#define MAXIMUM_WAIT_OBJECTS 1 +#endif + +/* To stringify the result of the expansion of a macro argument + * use two levels of macros. */ +#define dmstr2(s) dmstr1(s) +#define dmstr1(s) #s static char *_rules[] = { "MAXLINELENGTH := 32766", - "MAXPROCESSLIMIT := 4", - "MAXPROCESS := 1", + "MAXPROCESSLIMIT := " dmstr2(MAXIMUM_WAIT_OBJECTS) , ".IMPORT .IGNORE: DMAKEROOT", ".MAKEFILES : makefile.mk makefile", ".SOURCE : .NULL", -- cgit