commit e5fdfcdcb462195b1a91d5408c0ac738a0a55888
author Mark Salyzyn <salyzyn@google.com> Fri Jun 13 14:43:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 13 14:43:58 2014 +0000
tree 442c8f6481b2be1da2195c04dce791ca96c69eb3
parent 232c711795bfdbe2048222b57b1374fbea548839
parent 9b86360fb41b46abfc0e475cfdea4370a93179d5

am 9b86360f: am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"

* commit '9b86360fb41b46abfc0e475cfdea4370a93179d5':
  log: Fix warning with __USE_MINGW_ANSI_STDIO

include/android/log.h

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