luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put __attribute__((noreturn)) for declartions of function pointers

Browse Source 
Clang needs this change.



git-svn-id: https://google-glog.googlecode.com/svn/trunk@103 eb4d4688-79bd-11dd-afb4-1d65580434c0
This commit is contained in:
2012-01-12 07:45:39 +00:00
parent 6232847ecb
commit 11e78e4c66
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/logging.cc
View File

@ -1247,6 +1247,14 @@ void LogMessage::RecordCrashReason(
#endif
}
#ifdef HAVE___ATTRIBUTE__
# define ATTRIBUTE_NORETURN __attribute__((noreturn))
#else
# define ATTRIBUTE_NORETURN
#endif
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
@ -1257,15 +1265,13 @@ static void logging_fail() {
#endif
}
#ifdef HAVE___ATTRIBUTE__
typedef void (*logging_fail_func_t)() ATTRIBUTE_NORETURN;
GOOGLE_GLOG_DLL_DECL
void (*g_logging_fail_func)() __attribute__((noreturn)) = &logging_fail;
#else
GOOGLE_GLOG_DLL_DECL void (*g_logging_fail_func)() = &logging_fail;
#endif
logging_fail_func_t g_logging_fail_func = &logging_fail;
void InstallFailureFunction(void (*fail_func)()) {
g_logging_fail_func = fail_func;
g_logging_fail_func = (logging_fail_func_t)fail_func;
}
void LogMessage::Fail() {