Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 01 May 2003 14:35:16 -0400 (EDT)
From:      John Baldwin <jhb@FreeBSD.org>
To:        Nate Lawson <njl@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
Message-ID:  <XFMail.20030501143516.jhb@FreeBSD.org>
In-Reply-To: <200304291911.h3TJB0E2076851@repoman.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

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 <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.20030501143516.jhb>