summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica/acpivar.h
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2007-06-15 18:02:34 +0000
committernjl <njl@FreeBSD.org>2007-06-15 18:02:34 +0000
commit4791432171716d61887aa8408d9105a93011f61f (patch)
tree92691e312289ba9a7b6ee3b53cfc3dde9fcafc08 /sys/dev/acpica/acpivar.h
parent8a37be31291cc6642e87a4e17f346884f8ae26b5 (diff)
downloadFreeBSD-src-4791432171716d61887aa8408d9105a93011f61f.zip
FreeBSD-src-4791432171716d61887aa8408d9105a93011f61f.tar.gz
Convert magic to a uintptr_t. This should get rid of some warnings on
gcc4.
Diffstat (limited to 'sys/dev/acpica/acpivar.h')
-rw-r--r--sys/dev/acpica/acpivar.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 6c0281e..ceb9828 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -81,7 +81,7 @@ struct acpi_softc {
struct acpi_device {
/* ACPI ivars */
ACPI_HANDLE ad_handle;
- int ad_magic;
+ uintptr_t ad_magic;
void *ad_private;
int ad_flags;
@@ -227,7 +227,7 @@ static __inline void varp ## _set_ ## var(device_t dev, type t) \
}
__ACPI_BUS_ACCESSOR(acpi, handle, ACPI, HANDLE, ACPI_HANDLE)
-__ACPI_BUS_ACCESSOR(acpi, magic, ACPI, MAGIC, int)
+__ACPI_BUS_ACCESSOR(acpi, magic, ACPI, MAGIC, uintptr_t)
__ACPI_BUS_ACCESSOR(acpi, private, ACPI, PRIVATE, void *)
__ACPI_BUS_ACCESSOR(acpi, flags, ACPI, FLAGS, int)
OpenPOWER on IntegriCloud