diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-07-09 17:54:02 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-07-09 17:54:02 +0000 |
| commit | 57bb0b6ca49cdd01098ab04fda81a87197188825 (patch) | |
| tree | dfd1e75d9d7a42530736716ee1fc7c35f267f753 /sys/contrib/dev/acpica/acenv.h | |
| parent | 900789083d83b1bdef94797be7ef6652e6900546 (diff) | |
| download | FreeBSD-src-57bb0b6ca49cdd01098ab04fda81a87197188825.zip FreeBSD-src-57bb0b6ca49cdd01098ab04fda81a87197188825.tar.gz | |
Resolve conflicts arising from the ACPI CA 20020611 import.
Diffstat (limited to 'sys/contrib/dev/acpica/acenv.h')
| -rw-r--r-- | sys/contrib/dev/acpica/acenv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/contrib/dev/acpica/acenv.h b/sys/contrib/dev/acpica/acenv.h index 04945ef..bc9f59b 100644 --- a/sys/contrib/dev/acpica/acenv.h +++ b/sys/contrib/dev/acpica/acenv.h @@ -256,12 +256,14 @@ #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 /****************************************************************************** |
