From owner-cvs-all@FreeBSD.ORG Thu May 12 14:16:45 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16BD916A4CE; Thu, 12 May 2005 14:16:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0682F43D31; Thu, 12 May 2005 14:16:45 +0000 (GMT) (envelope-from harti@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4CEGiZL074235; Thu, 12 May 2005 14:16:44 GMT (envelope-from harti@repoman.freebsd.org) Received: (from harti@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4CEGiNq074234; Thu, 12 May 2005 14:16:44 GMT (envelope-from harti) Message-Id: <200505121416.j4CEGiNq074234@repoman.freebsd.org> From: Hartmut Brandt Date: Thu, 12 May 2005 14:16:44 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/usr.bin/make globals.h job.c job.h main.c parse.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2005 14:16:45 -0000 harti 2005-05-12 14:16:44 UTC FreeBSD src repository Modified files: usr.bin/make globals.h job.c job.h main.c parse.c Log: Fix the fix for bin/72510 applied in job.c:1.70. Actually there have been two maxJobs variables: one static in job.c and one global used in main.c and parse.c. Makeing one global out of these was the wrong way to fix the problem. Instead rename the global one to jobLimit and keep maxJobs static in job.c. Suggested by: rwatson PR: bin/72510 Revision Changes Path 1.9 +1 -0 src/usr.bin/make/globals.h 1.105 +6 -1 src/usr.bin/make/job.c 1.37 +0 -2 src/usr.bin/make/job.h 1.144 +5 -4 src/usr.bin/make/main.c 1.105 +1 -1 src/usr.bin/make/parse.c