From owner-cvs-all@FreeBSD.ORG Thu May 1 11:35:17 2003 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 8D11237B404 for ; Thu, 1 May 2003 11:35:17 -0700 (PDT) Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AD3343F93 for ; Thu, 1 May 2003 11:35:15 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 17137 invoked from network); 1 May 2003 18:35:20 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 1 May 2003 18:35:20 -0000 Received: from laptop.baldwin.cx ([216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h41IZBOv026435; Thu, 1 May 2003 14:35:11 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200304291911.h3TJB0E2076851@repoman.freebsd.org> Date: Thu, 01 May 2003 14:35:16 -0400 (EDT) From: John Baldwin To: Nate Lawson cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: RE: cvs commit: src/sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h acpi.h acpiosxf.h acpixf.h acutils.h dbcmds.c dbxface.c exfldio.c exsystem.c hwsleep.c psparse.c rscreate.c tbget.c utglobal.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, 01 May 2003 18:35:19 -0000 On 29-Apr-2003 Nate Lawson wrote: > njl 2003/04/29 12:11:00 PDT > > FreeBSD src repository > > Modified files: > sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h > acpi.h acpiosxf.h acpixf.h acutils.h > dbcmds.c dbxface.c exfldio.c exsystem.c > hwsleep.c psparse.c rscreate.c tbget.c > utglobal.c > Log: > Resolve conflicts. > > Revision Changes Path > 1.5 +5 -7 src/sys/contrib/dev/acpica/acenv.h This hunk looks bogus as it didn't change during the Intel import: @@ -260,14 +260,12 @@ #define DEBUGGER_SINGLE_THREADED 0 #define DEBUGGER_MULTI_THREADED 1 -#ifndef DEBUGGER_THREADING #ifdef ACPI_APPLICATION #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED #else #define DEBUGGER_THREADING DEBUGGER_MULTI_THREADED #endif -#endif /****************************************************************************** Without this change make kernel-depend of LINT gives a _lot_ of warnings. LINT also doesn't compile, but this is at least a good first step. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/