diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-02-10 15:55:15 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-02-10 15:55:15 +0200 |
| commit | 841ac10e5c20ad152f375f43bceb992fc3945041 (patch) | |
| tree | d2758b8eb34827e2ca3d1a20b2c523a2b623ec38 /src/debug.h | |
| parent | a7b158fada356f886b5c4648a7bd5f8114dca717 (diff) | |
| download | minetest-841ac10e5c20ad152f375f43bceb992fc3945041.tar.gz minetest-841ac10e5c20ad152f375f43bceb992fc3945041.tar.bz2 minetest-841ac10e5c20ad152f375f43bceb992fc3945041.zip | |
fixes toward mingw compatibility
Diffstat (limited to 'src/debug.h')
| -rw-r--r-- | src/debug.h | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/src/debug.h b/src/debug.h index 1973bb510..092bb03a8 100644 --- a/src/debug.h +++ b/src/debug.h @@ -238,18 +238,7 @@ private: assert(0);\ } #ifdef _WIN32 // Windows - -/*class SE_Exception : public std::exception -{ -private: - unsigned int nSE; -public: - SE_Exception() {} - SE_Exception( unsigned int n ) : nSE( n ) {} - ~SE_Exception() {} - unsigned int getSeNumber() { return nSE; } -};*/ - + #ifdef _MSC_VER // MSVC void se_trans_func(unsigned int, EXCEPTION_POINTERS*); class FatalSystemException : public BaseException @@ -259,14 +248,18 @@ public: BaseException(s) {} }; - - #define BEGIN_DEBUG_EXCEPTION_HANDLER \ - BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER\ - _set_se_translator(se_trans_func); - - #define END_DEBUG_EXCEPTION_HANDLER \ - END_PORTABLE_DEBUG_EXCEPTION_HANDLER - + #define BEGIN_DEBUG_EXCEPTION_HANDLER \ + BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER\ + _set_se_translator(se_trans_func); + + #define END_DEBUG_EXCEPTION_HANDLER \ + END_PORTABLE_DEBUG_EXCEPTION_HANDLER + #else // Probably mingw + #define BEGIN_DEBUG_EXCEPTION_HANDLER\ + BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER + #define END_DEBUG_EXCEPTION_HANDLER\ + END_PORTABLE_DEBUG_EXCEPTION_HANDLER + #endif #else // Posix #define BEGIN_DEBUG_EXCEPTION_HANDLER\ BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER |