Remove warnings from vendor files. This takes some files off the vendor

branch but they have indicated they will not fix these warnings.

4 files changed, 11 insertions, 11 deletions

diff --git a/sys/contrib/dev/acpica/dmopcode.c b/sys/contrib/dev/acpica/dmopcode.c
index ec941b0..9603fbe 100644
--- a/sys/contrib/dev/acpica/dmopcode.c
+++ b/sys/contrib/dev/acpica/dmopcode.c
@@ -340,7 +340,7 @@ AcpiDmMatchKeyword (
     }
     else
     {
-        AcpiOsPrintf ("%s", (char *) AcpiGbl_MatchOps[(ACPI_SIZE) Op->Common.Value.Integer]);
+        AcpiOsPrintf ("%s", (char *) (uintptr_t)AcpiGbl_MatchOps[(ACPI_SIZE) Op->Common.Value.Integer]);
     }
 }
 
diff --git a/sys/contrib/dev/acpica/hwregs.c b/sys/contrib/dev/acpica/hwregs.c
index 240b6a7..614e9137 100644
--- a/sys/contrib/dev/acpica/hwregs.c
+++ b/sys/contrib/dev/acpica/hwregs.c
@@ -233,7 +233,7 @@ AcpiGetSleepTypeData (
     /*
      * Evaluate the namespace object containing the values for this state
      */
-    Status = AcpiNsEvaluateByName ((char *) AcpiGbl_SleepStateNames[SleepState],
+    Status = AcpiNsEvaluateByName ((char *) (uintptr_t) AcpiGbl_SleepStateNames[SleepState],
                     NULL, &ObjDesc);
     if (ACPI_FAILURE (Status))
     {
diff --git a/sys/contrib/dev/acpica/uteval.c b/sys/contrib/dev/acpica/uteval.c
index 635d711..bb86b3a 100644
--- a/sys/contrib/dev/acpica/uteval.c
+++ b/sys/contrib/dev/acpica/uteval.c
@@ -171,7 +171,7 @@ AcpiUtOsiImplementation (
     for (i = 0; i < ACPI_NUM_OSI_STRINGS; i++)
     {
         if (!ACPI_STRCMP (StringDesc->String.Pointer, 
-                            (char *) AcpiGbl_ValidOsiStrings[i]))
+                            (char *) (uintptr_t) AcpiGbl_ValidOsiStrings[i]))
         {
             /* This string is supported */
 
@@ -759,7 +759,7 @@ AcpiUtExecute_Sxds (
     {
         Highest[i] = 0xFF;
         Status = AcpiUtEvaluateObject (DeviceNode,
-                    (char *) AcpiGbl_HighestDstateNames[i],
+                    (char *) (uintptr_t) AcpiGbl_HighestDstateNames[i],
                     ACPI_BTYPE_INTEGER, &ObjDesc);
         if (ACPI_FAILURE (Status))
         {
@@ -767,7 +767,7 @@ AcpiUtExecute_Sxds (
             {
                 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
                     "%s on Device %4.4s, %s\n",
-                    (char *) AcpiGbl_HighestDstateNames[i],
+                    (char *) (uintptr_t)AcpiGbl_HighestDstateNames[i],
                     AcpiUtGetNodeName (DeviceNode),
                     AcpiFormatException (Status)));
 
diff --git a/sys/contrib/dev/acpica/utglobal.c b/sys/contrib/dev/acpica/utglobal.c
index 0db55de..1c61544 100644
--- a/sys/contrib/dev/acpica/utglobal.c
+++ b/sys/contrib/dev/acpica/utglobal.c
@@ -494,7 +494,7 @@ AcpiUtGetRegionName (
         return ("InvalidSpaceId");
     }
 
-    return ((char *) AcpiGbl_RegionTypes[SpaceId]);
+    return ((char *) (uintptr_t) AcpiGbl_RegionTypes[SpaceId]);
 }
 
 
@@ -532,7 +532,7 @@ AcpiUtGetEventName (
         return ("InvalidEventID");
     }
 
-    return ((char *) AcpiGbl_EventTypes[EventId]);
+    return ((char *) (uintptr_t) AcpiGbl_EventTypes[EventId]);
 }
 
 
@@ -602,10 +602,10 @@ AcpiUtGetTypeName (
 
     if (Type > ACPI_TYPE_INVALID)
     {
-        return ((char *) AcpiGbl_BadType);
+        return ((char *) (uintptr_t) AcpiGbl_BadType);
     }
 
-    return ((char *) AcpiGbl_NsTypeNames[Type]);
+    return ((char *) (uintptr_t) AcpiGbl_NsTypeNames[Type]);
 }
 
 
@@ -722,10 +722,10 @@ AcpiUtGetDescriptorName (
 
     if (ACPI_GET_DESCRIPTOR_TYPE (Object) > ACPI_DESC_TYPE_MAX)
     {
-        return ((char *) AcpiGbl_BadType);
+        return ((char *) (uintptr_t) AcpiGbl_BadType);
     }
 
-    return ((char *) AcpiGbl_DescTypeNames[ACPI_GET_DESCRIPTOR_TYPE (Object)]);
+    return ((char *) (uintptr_t) AcpiGbl_DescTypeNames[ACPI_GET_DESCRIPTOR_TYPE (Object)]);
 
 }