summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2005-11-01 22:18:47 +0000
committerjkim <jkim@FreeBSD.org>2005-11-01 22:18:47 +0000
commit7bc04cb5a91251a67a3e40f7251fd882b7661456 (patch)
tree7c7e22bce37b371f78e9761ff97bf8420100f7ee
parent5f6a2493ddea1cf36a4dcd58b865c4148427e0a2 (diff)
downloadFreeBSD-src-7bc04cb5a91251a67a3e40f7251fd882b7661456.zip
FreeBSD-src-7bc04cb5a91251a67a3e40f7251fd882b7661456.tar.gz
Fix few compilation problems on vendor branch.
These fixes will be submitted vendor.
-rw-r--r--sys/contrib/dev/acpica/dbfileio.c3
-rw-r--r--sys/contrib/dev/acpica/osunixxf.c2
-rw-r--r--sys/contrib/dev/acpica/utalloc.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/sys/contrib/dev/acpica/dbfileio.c b/sys/contrib/dev/acpica/dbfileio.c
index f692a02..c49b0b4 100644
--- a/sys/contrib/dev/acpica/dbfileio.c
+++ b/sys/contrib/dev/acpica/dbfileio.c
@@ -140,6 +140,8 @@ FILE *AcpiGbl_DebugFile = NULL;
/* Local prototypes */
+#ifdef ACPI_APPLICATION
+
static ACPI_STATUS
AcpiDbCheckTextModeCorruption (
UINT8 *Table,
@@ -150,6 +152,7 @@ static ACPI_STATUS
AeLocalLoadTable (
ACPI_TABLE_HEADER *TablePtr);
+#endif
/*******************************************************************************
*
diff --git a/sys/contrib/dev/acpica/osunixxf.c b/sys/contrib/dev/acpica/osunixxf.c
index 18197d7..b693305 100644
--- a/sys/contrib/dev/acpica/osunixxf.c
+++ b/sys/contrib/dev/acpica/osunixxf.c
@@ -130,6 +130,8 @@
#include <contrib/dev/acpica/acparser.h>
#include <contrib/dev/acpica/acdebug.h>
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
+
#define _COMPONENT ACPI_OS_SERVICES
ACPI_MODULE_NAME ("osunixxf")
diff --git a/sys/contrib/dev/acpica/utalloc.c b/sys/contrib/dev/acpica/utalloc.c
index 4f6e15f..cc5fd01 100644
--- a/sys/contrib/dev/acpica/utalloc.c
+++ b/sys/contrib/dev/acpica/utalloc.c
@@ -123,6 +123,7 @@
/* Local prototypes */
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
static ACPI_DEBUG_MEM_BLOCK *
AcpiUtFindAllocation (
void *Allocation);
@@ -143,7 +144,6 @@ AcpiUtRemoveAllocation (
char *Module,
UINT32 Line);
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
static ACPI_STATUS
AcpiUtCreateList (
char *ListName,
OpenPOWER on IntegriCloud