summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-24 20:52:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-24 20:52:48 +0000
commitcef3eff0d903e49ad8b02ca1eab0d7c483eb3739 (patch)
tree7cfccbc0d9da41888e7a6c76c0b66f5d4fab935a /include
parentc0fb957404636259f6eb3693cb3831853c7dbffb (diff)
parent6d7a2ee4e8b590071042ae424a3e8c951f198a8f (diff)
downloadsystem_core-cef3eff0d903e49ad8b02ca1eab0d7c483eb3739.zip
system_core-cef3eff0d903e49ad8b02ca1eab0d7c483eb3739.tar.gz
system_core-cef3eff0d903e49ad8b02ca1eab0d7c483eb3739.tar.bz2
am 6d7a2ee4: am b1bcd9c3: am 6798914b: Merge "Improve liblog\'s fatal logging."
* commit '6d7a2ee4e8b590071042ae424a3e8c951f198a8f': Improve liblog's fatal logging.
Diffstat (limited to 'include')
-rw-r--r--include/android/log.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/android/log.h b/include/android/log.h
index 0ea4c29..f5b1900 100644
--- a/include/android/log.h
+++ b/include/android/log.h
@@ -110,11 +110,11 @@ int __android_log_vprint(int prio, const char *tag,
const char *fmt, va_list ap);
/*
- * Log an assertion failure and SIGTRAP the process to have a chance
- * to inspect it, if a debugger is attached. This uses the FATAL priority.
+ * Log an assertion failure and abort the process to have a chance
+ * to inspect it if a debugger is attached. This uses the FATAL priority.
*/
void __android_log_assert(const char *cond, const char *tag,
- const char *fmt, ...)
+ const char *fmt, ...)
#if defined(__GNUC__)
__attribute__ ((noreturn))
__attribute__ ((format(printf, 3, 4)))