diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:20:31 +0100 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:20:31 +0100 |
| commit | 666a76652bcc82c5f85e1a658eab83b27e9e78a4 (patch) | |
| tree | 7ef0770f47b0c4a691b4cbe2d9849ecbc8fa202c /external/easylogging++ | |
| parent | Merge pull request #3184 (diff) | |
| parent | call _exit instead of abort in release mode (diff) | |
| download | monero-666a76652bcc82c5f85e1a658eab83b27e9e78a4.tar.xz | |
Merge pull request #3187
851bd057 call _exit instead of abort in release mode (moneromooo-monero)
Diffstat (limited to 'external/easylogging++')
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index 57742b2e5..212a1822d 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -17,6 +17,8 @@ #define EASYLOGGING_CC #include "easylogging++.h" +#include <unistd.h> + #if defined(AUTO_INITIALIZE_EASYLOGGINGPP) INITIALIZE_EASYLOGGINGPP #endif @@ -36,7 +38,11 @@ static void abort(int status, const std::string& reason) { // Ignore msvc critical error dialog - break instead (on debug mode) _asm int 3 #else +#ifdef NDEBUG + ::_exit(1); +#else ::abort(); +#endif #endif // defined(ELPP_COMPILER_MSVC) && defined(_M_IX86) && defined(_DEBUG) } |