Merge remote-tracking branch 'upstream/master'

[dragonfireclient.git] / src / debug.cpp

diff --git a/src/debug.cpp b/src/debug.cpp
index 9fbdf7a396491d9c8d2304c44ad737ea41188268..a19186232a5b8d6e735b2db172ff5c7044135b0d 100644 (file)
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "porting.h"
 
 /*
        Debug output
@@ -33,6 +32,8 @@ void debugstreams_init(bool disable_stderr, const char *filename)
 {
        if(disable_stderr)
                g_debugstreams[0] = NULL;
+       else
+               g_debugstreams[0] = stderr;
 
        if(filename)
                g_debugstreams[1] = fopen(filename, "a");
@@ -43,6 +44,9 @@ void debugstreams_init(bool disable_stderr, const char *filename)
                fprintf(g_debugstreams[1],     "  Separator  \n");
                fprintf(g_debugstreams[1],     "-------------\n\n");
        }
+       
+       DEBUGPRINT("Debug streams initialized, disable_stderr=%d\n",
+                       disable_stderr);
 }
 
 void debugstreams_deinit()
@@ -74,8 +78,6 @@ void assert_fail(const char *assertion, const char *file,
        if(g_debugstreams[1])
                fclose(g_debugstreams[1]);
 
-       //sleep_ms(3000);
-
        abort();
 }
 
@@ -88,6 +90,7 @@ DebugStack::DebugStack(threadid_t id)
        threadid = id;
        stack_i = 0;
        stack_max_i = 0;
+       memset(stack, 0, DEBUG_STACK_SIZE*DEBUG_STACK_TEXT_SIZE);
 }
 
 void DebugStack::print(FILE *file, bool everything)
@@ -195,7 +198,8 @@ DebugStacker::~DebugStacker()
 }
 
 
-#ifdef _WIN32
+#ifdef _MSC_VER
+#if CATCH_UNHANDLED_EXCEPTIONS == 1
 void se_trans_func(unsigned int u, EXCEPTION_POINTERS* pExp)
 {
        dstream<<"In trans_func.\n";
@@ -221,6 +225,7 @@ void se_trans_func(unsigned int u, EXCEPTION_POINTERS* pExp)
        }
 }
 #endif
+#endif