commit 4e3f28e748e0fe6e71d34a898c6a670621786200
author Andrew Hsieh <andrewhsieh@google.com> Wed Jun 04 12:27:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 04 12:27:05 2014 +0000
tree f5a0081b93ca0db546e216672a694c63044d4445
parent e7110ac09bdc77c4a8f7823aa666c9929a33984c
parent 7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60

am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"

* commit '7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60':
  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