From 5b6c24281d736305aa126c75f150c25167353f6c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 7 Jan 2024 13:07:28 -0500
Subject: [PATCH] Fixup DEBUGMODE builds
doomdef.h: check if the build system already define our DEBUG code
version.mk: do not fail on our inline functions in DEBUGMODE
features.mk: we do not need the VALGRIND libraies, just the headers
mserv.c: start registered with false in Update_parameters()
---
src/Makefile.d/features.mk | 1 +
src/Makefile.d/versions.mk | 3 +++
src/doomdef.h | 8 ++++++++
src/mserv.c | 2 +-
4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk
index b0ff2a71f8..7ea07f71c0 100644
--- a/src/Makefile.d/features.mk
+++ b/src/Makefile.d/features.mk
@@ -61,6 +61,7 @@ endif
# (Valgrind is a memory debugger.)
ifdef VALGRIND
VALGRIND_PKGCONFIG?=valgrind
+VALGRIND_LDFLAGS=
$(eval $(call Use_pkg_config,VALGRIND))
ZDEBUG=1
opts+=-DHAVE_VALGRIND
diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk
index 2523d7f3c2..b639ad9a13 100644
--- a/src/Makefile.d/versions.mk
+++ b/src/Makefile.d/versions.mk
@@ -84,6 +84,9 @@ endif
WFLAGS+=-Wnested-externs
#WFLAGS+=-Wunreachable-code
WFLAGS+=-Winline
+ifdef DEBUGMODE
+ WFLAGS+=-Wno-error=inline
+endif
ifdef GCC43
WFLAGS+=-funit-at-a-time
WFLAGS+=-Wlogical-op
diff --git a/src/doomdef.h b/src/doomdef.h
index 45d6645faa..b0610cb823 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -110,11 +110,19 @@ FILE *fopenfile(const char*, const char*);
// If you don't disable ALL debug first, you get ALL debug enabled
#if !defined (NDEBUG)
+#ifndef PACKETDROP
#define PACKETDROP
+#endif
+#ifndef PARANOIA
#define PARANOIA
+#endif
+#ifndef RANGECHECK
#define RANGECHECK
+#endif
+#ifndef ZDEBUG
#define ZDEBUG
#endif
+#endif
// Uncheck this to compile debugging code
//#define RANGECHECK
diff --git a/src/mserv.c b/src/mserv.c
index f83b16d07e..d60cc09c5d 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -506,7 +506,7 @@ static void
Update_parameters (void)
{
#ifdef MASTERSERVER
- int registered;
+ int registered = 0;
int delayed;
if (Online())
--
GitLab