Module Name: src
Committed By: jruoho
Date: Sun Jun 6 18:33:15 UTC 2010
Modified Files:
src/sys/external/intel-public/acpica/dist/debugger: dbdisply.c
src/sys/external/intel-public/acpica/dist/include: acutils.h
src/sys/external/intel-public/acpica/dist/utilities: utglobal.c
Log Message:
ACPICA does not understand the const type qualifier.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/intel-public/acpica/dist/include/acutils.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/intel-public/acpica/dist/utilities/utglobal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c
diff -u src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c:1.1.1.3 src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c:1.2
--- src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c:1.1.1.3 Sun Jun 6 18:16:59 2010
+++ src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c Sun Jun 6 18:33:14 2010
@@ -816,7 +816,7 @@
ACPI_GPE_XRUPT_INFO *GpeXruptInfo;
ACPI_GPE_EVENT_INFO *GpeEventInfo;
ACPI_GPE_REGISTER_INFO *GpeRegisterInfo;
- char *GpeType;
+ const char *GpeType;
UINT32 GpeIndex;
UINT32 Block = 0;
UINT32 i;
Index: src/sys/external/intel-public/acpica/dist/include/acutils.h
diff -u src/sys/external/intel-public/acpica/dist/include/acutils.h:1.3 src/sys/external/intel-public/acpica/dist/include/acutils.h:1.4
--- src/sys/external/intel-public/acpica/dist/include/acutils.h:1.3 Thu Apr 8 04:31:49 2010
+++ src/sys/external/intel-public/acpica/dist/include/acutils.h Sun Jun 6 18:33:14 2010
@@ -213,7 +213,7 @@
AcpiUtGetNodeName (
void *Object);
-char *
+const char *
AcpiUtGetDescriptorName (
void *Object);
Index: src/sys/external/intel-public/acpica/dist/utilities/utglobal.c
diff -u src/sys/external/intel-public/acpica/dist/utilities/utglobal.c:1.4 src/sys/external/intel-public/acpica/dist/utilities/utglobal.c:1.5
--- src/sys/external/intel-public/acpica/dist/utilities/utglobal.c:1.4 Sun Jun 6 18:28:36 2010
+++ src/sys/external/intel-public/acpica/dist/utilities/utglobal.c Sun Jun 6 18:33:14 2010
@@ -644,14 +644,14 @@
};
-char *
+const char *
AcpiUtGetDescriptorName (
void *Object)
{
if (!Object)
{
- return __UNCONST("NULL OBJECT");
+ return ("NULL OBJECT");
}
if (ACPI_GET_DESCRIPTOR_TYPE (Object) > ACPI_DESC_TYPE_MAX)
