commit 7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60
author Andrew Hsieh <andrewhsieh@google.com> Wed Jun 04 07:10:59 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 04 07:11:00 2014 +0000
tree af567eedc8a6cbf2fb0a1bfd9337f05f58bae2f1
parent b122da648dd1a7860776bc90b219ffa8c215faa6
parent ad832859a7ccd7ba44b6f97e0933ab0b413d62b6

Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"

include/android/log.h

diff --git a/include/android/log.h b/include/android/log.h
index f5b1900..ad36bd2 100644
--- a/include/android/log.h
+++ b/include/android/log.h
@@ -98,8 +98,12 @@
  */
 int __android_log_print(int prio, const char *tag,  const char *fmt, ...)
 #if defined(__GNUC__)
+#if __USE_MINGW_ANSI_STDIO
+    __attribute__ ((format(gnu_printf, 3, 4)))
+#else
     __attribute__ ((format(printf, 3, 4)))
 #endif
+#endif
     ;
 
 /*
@@ -117,8 +121,12 @@
                           const char *fmt, ...)
 #if defined(__GNUC__)
     __attribute__ ((noreturn))
+#if __USE_MINGW_ANSI_STDIO
+    __attribute__ ((format(gnu_printf, 3, 4)))
+#else
     __attribute__ ((format(printf, 3, 4)))
 #endif
+#endif
     ;
 
 #ifdef __cplusplus