From 945d2d21a485e9c730b9784ad2e535906c0abdb1 Mon Sep 17 00:00:00 2001 From: nhmall Date: Wed, 2 Dec 2015 23:29:18 -0500 Subject: [PATCH] windows build fix without DEBUG defined --- sys/share/pcmain.c | 4 +++- win/win32/mswproc.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c index 5a78fb696..b1b032250 100644 --- a/sys/share/pcmain.c +++ b/sys/share/pcmain.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 pcmain.c $NHDT-Date: 1434999947 2015/06/22 19:05:47 $ $NHDT-Branch: master $:$NHDT-Revision: 1.65 $ */ +/* NetHack 3.6 pcmain.c $NHDT-Date: 1449116934 2015/12/03 04:28:54 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.66 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -123,6 +123,7 @@ char *argv[]; boolean resuming = FALSE; /* assume new game */ #ifdef _MSC_VER +# ifdef DEBUG /* set these appropriately for VS debugging */ _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG); _CrtSetReportMode(_CRT_ERROR, @@ -132,6 +133,7 @@ char *argv[]; /* use STDERR by default _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/ +# endif #endif #if defined(__BORLANDC__) && !defined(_WIN32) diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index f4eb6a0fb..b5612d804 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mswproc.c $NHDT-Date: 1433806620 2015/06/08 23:37:00 $ $NHDT-Branch: master $:$NHDT-Revision: 1.90 $ */ +/* NetHack 3.6 mswproc.c $NHDT-Date: 1449116947 2015/12/03 04:29:07 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.93 $ */ /* Copyright (C) 2001 by Alex Kompel */ /* NetHack may be freely redistributed. See license for details. */ @@ -31,9 +31,11 @@ #define NHTRACE_LOG "nhtrace.log" -#ifdef _DEBUG +#ifdef DEBUG +# ifdef _DEBUG static FILE* _s_debugfp = NULL; extern void logDebug(const char *fmt, ...); +# endif #else void logDebug(const char *fmt, ...) @@ -132,11 +134,13 @@ mswin_init_nhwindows(int *argc, char **argv) UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); -#ifdef _DEBUG +#ifdef DEBUG +# ifdef _DEBUG if (showdebug(NHTRACE_LOG) && !_s_debugfp) { /* truncate trace file */ _s_debugfp = fopen(NHTRACE_LOG, "w"); } +# endif #endif logDebug("mswin_init_nhwindows()\n"); @@ -2192,7 +2196,8 @@ mswin_popup_destroy(HWND hWnd) SetFocus(GetNHApp()->hMainWnd); } -#ifdef _DEBUG +#ifdef DEBUG +# ifdef _DEBUG #include void @@ -2208,7 +2213,7 @@ logDebug(const char *fmt, ...) va_end(args); fflush(_s_debugfp); } - +# endif #endif /* Reading and writing settings from the registry. */