You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against a2460b2424163bbf5b885db6a5423c3d98f883e0.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From eee7c92a62872ca06bb864674ea73ddab09f362e Mon Sep 17 00:00:00 2001
|
||||
From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 6 Oct 2014 05:06:06 +0200
|
||||
Subject: dbghelp: Always check for debug symbols in BINDIR.
|
||||
@@ -9,7 +9,7 @@ Subject: dbghelp: Always check for debug symbols in BINDIR.
|
||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
|
||||
index 86846cb..6b72980 100644
|
||||
index 3e120e8afe9..6746ca7dbd9 100644
|
||||
--- a/dlls/dbghelp/Makefile.in
|
||||
+++ b/dlls/dbghelp/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@@ -17,11 +17,11 @@ index 86846cb..6b72980 100644
|
||||
IMPORTLIB = dbghelp
|
||||
-EXTRADEFS = -D_IMAGEHLP_SOURCE_
|
||||
+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="\"${bindir}\""
|
||||
IMPORTS = psapi
|
||||
DELAYIMPORTS = version
|
||||
EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)
|
||||
|
||||
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
|
||||
index b176143..8e22265 100644
|
||||
index 6428955941c..75c0a4c2453 100644
|
||||
--- a/dlls/dbghelp/elf_module.c
|
||||
+++ b/dlls/dbghelp/elf_module.c
|
||||
@@ -1486,9 +1486,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
|
||||
@@ -40,5 +40,5 @@ index b176143..8e22265 100644
|
||||
load_offset, dyn_addr, elf_info);
|
||||
}
|
||||
--
|
||||
2.6.2
|
||||
2.11.0
|
||||
|
||||
|
Reference in New Issue
Block a user