Module Name: src
Committed By: joerg
Date: Wed May 23 21:16:57 UTC 2018
Modified Files:
src/sys/external/bsd/acpica/dist/include: actypes.h
Log Message:
Replace null pointer arithmethic with direct cast
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/include/actypes.h
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/bsd/acpica/dist/include/actypes.h
diff -u src/sys/external/bsd/acpica/dist/include/actypes.h:1.15 src/sys/external/bsd/acpica/dist/include/actypes.h:1.16
--- src/sys/external/bsd/acpica/dist/include/actypes.h:1.15 Sat Apr 7 15:49:51 2018
+++ src/sys/external/bsd/acpica/dist/include/actypes.h Wed May 23 21:16:57 2018
@@ -550,8 +550,8 @@ typedef UINT64
/* Pointer/Integer type conversions */
-#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) 0, (ACPI_SIZE) (i))
-#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0)
+#define ACPI_TO_POINTER(i) ((void *)((uintptr_t)(ACPI_SIZE) (i)))
+#define ACPI_TO_INTEGER(p) ((uintptr_t)(p))
#define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0)
#define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)
#define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i)
