[ros-diffs] [reactos] 03/05: [DBGHELP] Fix 64 bit issue

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2e16abc91a0a900e57c2…

commit c2e16abc91a0a900e57c2ff185d78bdb4a5c5435
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sun Apr 7 18:17:18 2019 +0200
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sat Apr 13 14:07:50 2019 +0200

    [DBGHELP] Fix 64 bit issue
---
 dll/win32/dbghelp/dbghelp_private.h | 4 ++++
 dll/win32/dbghelp/dwarf.c           | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h
index 9848acb1104..9eb0592fcab 100644
--- a/dll/win32/dbghelp/dbghelp_private.h
+++ b/dll/win32/dbghelp/dbghelp_private.h
@@ -151,7 +151,11 @@ struct location
 {
     unsigned            kind : 8,
                         reg;
+#ifndef __REACTOS__
     unsigned long       offset;
+#else
+    uintptr_t           offset;
+#endif
 };
 
 struct symt
diff --git a/dll/win32/dbghelp/dwarf.c b/dll/win32/dbghelp/dwarf.c
index 0d517929186..04438f74a95 100644
--- a/dll/win32/dbghelp/dwarf.c
+++ b/dll/win32/dbghelp/dwarf.c
@@ -948,7 +948,11 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t*
ctx,
                                          sizeof(unsigned) + xloc.u.block.size);
             *ptr = xloc.u.block.size;
             memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size);
+#ifndef __REACTOS__
             loc->offset = (unsigned long)ptr;
+#else
+            loc->offset = (uintptr_t)ptr;
+#endif
         }
     }
     return TRUE;