windows build without DEBUG defined in global.h

 Changes to be committed:
	modified:   include/global.h
	modified:   sys/share/pcmain.c
	modified:   win/win32/mswproc.c

diff --git a/include/global.h b/include/global.h
index 73a2c1802468fcdbb76e2c95e5ed9b36649add0f..b7a61bd16c96337ce20e8ef08c9b9f40f0b925d1 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6 global.h        $NHDT-Date: 1432512780 2015/05/25 00:13:00 $  $NHDT-Branch: master $:$NHDT-Revision: 1.44 $ */
+/* NetHack 3.6 global.h        $NHDT-Date: 1449116298 2015/12/03 04:18:18 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.46 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -7,9 +7,9 @@
 
 #include <stdio.h>
 
-/* #define BETA /* development or beta testing [MRS] */
+/* #define BETA */ /* development or beta testing [MRS] */
 
-#define DEBUG
+/* #define DEBUG */
 
 /*
  * Files expected to exist in the playground directory.

diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c
index 5a78fb6964acd6c12eba6308e65b86f1d2833fde..0276d61f828a4f2488016833e10834aac5795af9 100644 (file)
--- 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: 1449116336 2015/12/03 04:18:56 $  $NHDT-Branch: NetHack-3.6.0 $:$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 f4eb6a0fb401a1658b41a2dd3d16a76a50bb31a0..7bd28ebbe763d03f5c5dda88dcb54c2e0ff111ae 100644 (file)
--- 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: 1449116317 2015/12/03 04:18:37 $  $NHDT-Branch: NetHack-3.6.0 $:$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, ...)