Jacek Caban : dbghelp: Use local declaration for 64-bit macho nlist.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f48f8cc39980f2d93015ecd56f28e3e9f52843fe
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f48f8cc39980f2d93015ecd56f28e3e9f52843fe

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Sun Mar 29 21:03:04 2020 +0200

dbghelp: Use local declaration for 64-bit macho nlist.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dbghelp/image_private.h |  9 +++++++++
 dlls/dbghelp/macho_module.c  |  2 +-
 dlls/dbghelp/stabs.c         | 17 ++---------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h
index 2b094d6db5..13af7524fe 100644
--- a/dlls/dbghelp/image_private.h
+++ b/dlls/dbghelp/image_private.h
@@ -143,6 +143,15 @@ struct stab_nlist
     unsigned            n_value;
 };
 
+struct macho64_nlist
+{
+    unsigned            n_strx;
+    unsigned char       n_type;
+    char                n_other;
+    short               n_desc;
+    UINT64              n_value;
+};
+
 BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN;
 
 BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) DECLSPEC_HIDDEN;
diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c
index ff7cf2b3c0..ab88d27108 100644
--- a/dlls/dbghelp/macho_module.c
+++ b/dlls/dbghelp/macho_module.c
@@ -932,7 +932,7 @@ static int macho_parse_symtab(struct image_file_map* ifm,
     struct macho_debug_info*        mdi = user;
     const char*                     stabstr;
     int                             ret = 0;
-    size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct nlist_64);
+    size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct macho64_nlist);
     const char *stab;
 
     TRACE("(%p/%p, %p, %p) %u syms at 0x%08x, strings 0x%08x - 0x%08x\n", fmap, fmap->handle, lc,
diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c
index 6b15ca1f0d..b2da8f866b 100644
--- a/dlls/dbghelp/stabs.c
+++ b/dlls/dbghelp/stabs.c
@@ -34,27 +34,14 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <stdio.h>
 #include <assert.h>
 #include <stdarg.h>
 
-#ifdef HAVE_MACH_O_NLIST_H
-# include <mach-o/nlist.h>
-#endif
-
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
@@ -1290,7 +1277,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
 
 #ifdef __APPLE__
     if (module->process->is_64bit)
-        stabsize = sizeof(struct nlist_64);
+        stabsize = sizeof(struct macho64_nlist);
 #endif
     nstab = stablen / stabsize;
     strs_end = strs + strtablen;
@@ -1314,7 +1301,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
         n_value = stab_ptr->n_value;
 #ifdef __APPLE__
         if (module->process->is_64bit)
-            n_value = ((struct nlist_64 *)stab_ptr)->n_value;
+            n_value = ((struct macho64_nlist *)stab_ptr)->n_value;
 #endif
         ptr = strs + stab_ptr->n_strx;
         if ((ptr > strs_end) || (ptr + strlen(ptr) > strs_end))