commit 903e3492d7e76ce0f8bf567b2bc62751fc4750e9
author Elliott Hughes <enh@google.com> Wed Jan 04 00:48:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 04 00:48:59 2017 +0000
tree a2a140254088b974cdb7e5b2ed8794c3e58cce51
parent d33bc96aaff1806b936376e88006f4d07bbdbdcb
parent 26031d379635164c0cf098a125a65b8c815aae6c

Merge "Don't use bare `noreturn` in log.h." am: fe05f1cde4 am: 3f789b70ea am: ed5555ed8a
am: 2ebbcb17cf

Change-Id: I720de4a9a09739cc37d90af029f72a702b2db578

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
     ;