projects
/
platform
/
upstream
/
glog.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support signal handler on Windows
[platform/upstream/glog.git]
/
src
/
logging.cc
diff --git
a/src/logging.cc
b/src/logging.cc
index
0b5e6ee
..
32a5791
100644
(file)
--- a/
src/logging.cc
+++ b/
src/logging.cc
@@
-1463,16
+1463,13
@@
void LogMessage::RecordCrashReason(
# define ATTRIBUTE_NORETURN
#endif
# define ATTRIBUTE_NORETURN
#endif
+#if defined(OS_WINDOWS)
+__declspec(noreturn)
+#endif
static void logging_fail() ATTRIBUTE_NORETURN;
static void logging_fail() {
static void logging_fail() ATTRIBUTE_NORETURN;
static void logging_fail() {
-#if defined(_DEBUG) && defined(_MSC_VER)
- // When debugging on windows, avoid the obnoxious dialog and make
- // it possible to continue past a LOG(FATAL) in the debugger
- __debugbreak();
-#else
abort();
abort();
-#endif
}
typedef void (*logging_fail_func_t)() ATTRIBUTE_NORETURN;
}
typedef void (*logging_fail_func_t)() ATTRIBUTE_NORETURN;