Commented out debug statements again

[oweals/minetest.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index 092bb03a819f67486ecca67964fdbd4855bd773b..f3cfe88b338209bf68ed0a3ba1980253cab9fc0f 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -33,7 +33,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifdef _WIN32
        #define WIN32_LEAN_AND_MEAN
        #include <windows.h>
-       #include <eh.h>
+       #ifdef _MSC_VER
+               #include <eh.h>
+       #endif
 #else
 #endif
 
@@ -83,7 +85,7 @@ public:
                
                return c;
        }
-       int xsputn(const char *s, int n)
+       std::streamsize xsputn(const char *s, std::streamsize n)
        {
                for(int i=0; i<DEBUGSTREAM_COUNT; i++)
                {
@@ -167,7 +169,10 @@ private:
        bool m_overflowed;
 };
 
-#define DSTACK(...)\
+#define DSTACK(msg)\
+       DebugStacker __debug_stacker(msg);
+
+#define DSTACKF(...)\
        char __buf[DEBUG_STACK_TEXT_SIZE];\
        snprintf(__buf,\
                        DEBUG_STACK_TEXT_SIZE, __VA_ARGS__);\