--- acpica-unix-20060317/common/dmrestag.c.orig	Mon Mar 27 17:27:36 2006
+++ acpica-unix-20060317/common/dmrestag.c	Mon Mar 27 18:38:58 2006
@@ -544,7 +544,7 @@
          * length (both in bytes)
          */
         if ((ByteIndex >= Node->Value) &&
-            (ByteIndex < (Node->Value + (UINT32) Node->Object)))
+            (ByteIndex < (Node->Value + ACPI_TO_INTEGER (Node->Object))))
         {
             return (Node);
         }
@@ -957,7 +957,7 @@
     UINT32                  Length,
     UINT32                  Offset,
     UINT8                   ResourceIndex,
-    ACPI_NAMESPACE_NODE     *BufferNode)
+    void                    *Context)
 {
     ACPI_STATUS             Status;
     ACPI_GENERIC_STATE      ScopeInfo;
@@ -968,7 +968,7 @@
 
     /* Add the resource to the namespace, as child of the buffer */
 
-    ScopeInfo.Scope.Node = BufferNode;
+    ScopeInfo.Scope.Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, Context);
     Status = AcpiNsLookup (&ScopeInfo, "_TMP", ACPI_TYPE_LOCAL_RESOURCE,
                 ACPI_IMODE_LOAD_PASS2,
                 ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_PREFIX_IS_SCOPE,
@@ -985,7 +985,7 @@
     /* Save the offset of the descriptor (within the original buffer) */
 
     Node->Value = Offset;
-    Node->Object = (void *) Length;
+    Node->Object = ACPI_CAST_PTR (void, Length);
     return (AE_OK);
 }
 
--- acpica-unix-20060317/resources/rslist.c.orig	Mon Mar 27 17:27:37 2006
+++ acpica-unix-20060317/resources/rslist.c	Mon Mar 27 17:52:35 2006
@@ -144,8 +144,10 @@
     UINT32                  Length,
     UINT32                  Offset,
     UINT8                   ResourceIndex,
-    void                    **ResourcePtr)
+    void                    *Context)
 {
+    ACPI_RESOURCE           **ResourcePtr = ACPI_CAST_INDIRECT_PTR (ACPI_RESOURCE,
+                                                Context);
     ACPI_RESOURCE           *Resource = *ResourcePtr;
     ACPI_STATUS             Status;