diff --git a/library/lua/memscan.lua b/library/lua/memscan.lua index 87e2ad58c..47a860f83 100644 --- a/library/lua/memscan.lua +++ b/library/lua/memscan.lua @@ -157,8 +157,17 @@ function MemoryArea.new(astart, aend) uint32_t = CheckedArray.new('uint32_t',astart,aend), int64_t = CheckedArray.new('int64_t',astart,aend), uint64_t = CheckedArray.new('uint64_t',astart,aend), - float = CheckedArray.new('float',astart,aend) + float = CheckedArray.new('float',astart,aend), + intptr_t = CheckedArray.new('intptr_t',astart,aend), + uintptr_t = CheckedArray.new('uintptr_t',astart,aend), } + if dfhack.getOSType() == 'windows' then + -- always 32 bits on Windows + obj.long = obj.int32_t + else + -- size of pointer on Linux/OS X + obj.long = obj.intptr_t + end setmetatable(obj, MemoryArea) return obj end diff --git a/scripts b/scripts index b9f223612..43bf43767 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit b9f223612bbcebfa8aa3de368fd5deadc1d4589d +Subproject commit 43bf437671380c78d4e0a6c55c6b94316dce930c