commit fe05f1cde4fd812bbb20a39d37ee7be6b95402c3
author Elliott Hughes <enh@google.com> Wed Jan 04 00:37:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 04 00:37:18 2017 +0000
tree 65245b4ab2ee6b7f3262d2c47193fbbbe22540dc
parent 4a3b03e9e5ddd78ac85e5091b04c67d4bffdbb6a
parent 9b3b119912fb76ebc3d964080ab504cd5768197c

Merge "Don't use bare `noreturn` in log.h."

liblog/legacy-ndk-includes/log.h

diff --git a/liblog/legacy-ndk-includes/log.h b/liblog/legacy-ndk-includes/log.h
index 0ea4c29..d40d6fa 100644
--- a/liblog/legacy-ndk-includes/log.h
+++ b/liblog/legacy-ndk-includes/log.h
@@ -98,7 +98,7 @@
  */
 int __android_log_print(int prio, const char *tag,  const char *fmt, ...)
 #if defined(__GNUC__)
-    __attribute__ ((format(printf, 3, 4)))
+    __attribute__((__format__(printf, 3, 4)))
 #endif
     ;
 
@@ -116,8 +116,8 @@
 void __android_log_assert(const char *cond, const char *tag,
 			  const char *fmt, ...)    
 #if defined(__GNUC__)
-    __attribute__ ((noreturn))
-    __attribute__ ((format(printf, 3, 4)))
+    __attribute__((__noreturn__))
+    __attribute__((__format__(printf, 3, 4)))
 #endif
     ;