=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: dbghelp: Fix compiler warnings with flag -Wunused-macros.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Dec 10 15:34:08 CST 2014
Module: wine
Branch: master
Commit: b2f967e0865f231991a8c83693bbc81ef5afba74
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f967e0865f231991a8c83693bbc81ef5afba74
Author: André Hentschel <nerv at dawncrow.de>
Date: Tue Dec 9 23:29:52 2014 +0100
dbghelp: Fix compiler warnings with flag -Wunused-macros.
---
dlls/dbghelp/cpu_i386.c | 1 -
dlls/dbghelp/cpu_x86_64.c | 18 ++----------------
dlls/dbghelp/msc.c | 2 --
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c
index 87f833f..8a3c074 100644
--- a/dlls/dbghelp/cpu_i386.c
+++ b/dlls/dbghelp/cpu_i386.c
@@ -29,7 +29,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
-#define STEP_FLAG 0x00000100 /* single step flag */
#define V86_FLAG 0x00020000
#define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG)
diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c
index e0ffb11..94f561c 100644
--- a/dlls/dbghelp/cpu_x86_64.c
+++ b/dlls/dbghelp/cpu_x86_64.c
@@ -76,21 +76,6 @@ typedef struct _UNWIND_INFO
*/
} UNWIND_INFO, *PUNWIND_INFO;
-#define GetUnwindCodeEntry(info, index) \
- ((info)->UnwindCode[index])
-
-#define GetLanguageSpecificDataPtr(info) \
- ((PVOID)&GetUnwindCodeEntry((info),((info)->CountOfCodes + 1) & ~1))
-
-#define GetExceptionHandler(base, info) \
- ((PEXCEPTION_HANDLER)((base) + *(PULONG)GetLanguageSpecificDataPtr(info)))
-
-#define GetChainedFunctionEntry(base, info) \
- ((PRUNTIME_FUNCTION)((base) + *(PULONG)GetLanguageSpecificDataPtr(info)))
-
-#define GetExceptionDataPtr(info) \
- ((PVOID)((PULONG)GetLanguageSpecificData(info) + 1)
-
static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx,
enum cpu_addr ca, ADDRESS64* addr)
{
@@ -107,6 +92,8 @@ static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx,
}
}
+#ifdef __x86_64__
+
enum st_mode {stm_start, stm_64bit, stm_done};
/* indexes in Reserved array */
@@ -118,7 +105,6 @@ enum st_mode {stm_start, stm_64bit, stm_done};
#define curr_count (frame->Reserved[__CurrentCount])
/* #define ??? (frame->Reserved[__]) (unused) */
-#ifdef __x86_64__
union handler_data
{
RUNTIME_FUNCTION chain;
diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index 636655f..3b12a3a 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -58,8 +58,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc);
-#define MAX_PATHNAME_LEN 1024
-
struct pdb_stream_name
{
const char* name;
More information about the wine-cvs
mailing list