From 1927df852db270e4841859d7a5b352b36eda67e6 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 4 Mar 2012 09:31:02 +0000 Subject: [PATCH] Remove four self-assignments in backtrace.c that were added to avoid an unused parameter warning and add ATTRIBUTE((unused)) to the implicated parameters so they will not trigger the warning because they could not be removed. git-svn-id: https://svn.eduke32.com/eduke32@2397 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile | 2 +- polymer/eduke32/Windows/src/backtrace.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 6dc1d14dd..7d8a16ba8 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -348,7 +348,7 @@ endif # RULES $(EBACKTRACEDLL): Windows/src/backtrace.c - if $(CC) -O2 -shared -Wall -Wextra -o $@ $^ -lbfd -liberty -limagehlp; then $(COMPILE_OK); else $(COMPILE_FAILED); fi + if $(CC) -O2 -shared -Wall -Wextra -I$(EINC) -o $@ $^ -lbfd -liberty -limagehlp; then $(COMPILE_OK); else $(COMPILE_FAILED); fi $(OBJ)/%.$o: $(SRC)/%.nasm $(COMPILE_STATUS) diff --git a/polymer/eduke32/Windows/src/backtrace.c b/polymer/eduke32/Windows/src/backtrace.c index 496151d96..6c1ffb587 100644 --- a/polymer/eduke32/Windows/src/backtrace.c +++ b/polymer/eduke32/Windows/src/backtrace.c @@ -35,6 +35,8 @@ #include #include +#include "compat.h" + #define BUFFER_MAX (16*1024) struct bfd_ctx { @@ -365,11 +367,8 @@ backtrace_unregister(void) } BOOL WINAPI -DllMain(HANDLE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +DllMain(HANDLE hinstDLL ATTRIBUTE((unused)), DWORD dwReason, LPVOID lpvReserved ATTRIBUTE((unused))) { - hinstDLL = hinstDLL; - lpvReserved = lpvReserved; - switch (dwReason) { case DLL_PROCESS_ATTACH: backtrace_register(); @@ -383,10 +382,8 @@ DllMain(HANDLE hinstDLL, DWORD dwReason, LPVOID lpvReserved) /* cut dependence on libintl... libbfd needs this */ -char *libintl_dgettext (const char *domain_name, const char *msgid) +char *libintl_dgettext (const char *domain_name ATTRIBUTE((unused)), const char *msgid ATTRIBUTE((unused))) { static char buf[1024] = "XXX placeholder XXX"; - domain_name = domain_name; - msgid = msgid; return buf; }