Jacek Caban : dbghelp: Always build all loader backends.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Mon Apr  6 19:42:26 2020 +0200

dbghelp: Always build all loader backends.

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/dbghelp/elf_module.c   | 28 ----------------------------
 dlls/dbghelp/macho_module.c | 14 --------------
 2 files changed, 42 deletions(-)

diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index 96c7484cef..72e9d2124a 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -19,13 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
-#include "wine/port.h"
-
-#if defined(__svr4__) || defined(__sun)
-#define __ELF__ 1
-#endif
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,8 +30,6 @@
 #include "wine/debug.h"
 #include "wine/heap.h"

-#ifdef __ELF__
-
 #define ELF_INFO_DEBUG_HEADER   0x0001
 #define ELF_INFO_MODULE         0x0002
 #define ELF_INFO_NAME           0x0004
@@ -1778,22 +1769,3 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr)
     pcs->loader = &elf_loader_ops;
     return TRUE;
 }
-
-#else	/* !__ELF__ */
-
-BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap)
-{
-    return FALSE;
-}
-
-BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr)
-{
-    return FALSE;
-}
-
-int elf_is_in_thunk_area(ULONG_PTR addr,
-                         const struct elf_thunk_area* thunks)
-{
-    return -1;
-}
-#endif  /* __ELF__ */
diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c
index 3ef65af7c9..4baf444f9e 100644
--- a/dlls/dbghelp/macho_module.c
+++ b/dlls/dbghelp/macho_module.c
@@ -21,9 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
-#include "wine/port.h"
-
 #include <stdio.h>
 #include <assert.h>
 #include <stdarg.h>
@@ -42,8 +39,6 @@
 #include "wine/debug.h"
 #include "wine/heap.h"

-#ifdef HAVE_MACH_O_LOADER_H
-
 struct dyld_image_info32
 {
     UINT32  imageLoadAddress;  /* const struct mach_header* */
@@ -1933,12 +1928,3 @@ BOOL macho_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr)
     TRACE("Found macho debug header %#lx\n", pcs->dbg_hdr_addr);
     return TRUE;
 }
-
-#else  /* HAVE_MACH_O_LOADER_H */
-
-BOOL macho_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr)
-{
-    return FALSE;
-}
-
-#endif  /* HAVE_MACH_O_LOADER_H */