am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"

* commit '7fa1cd19638c8ada0786e03abe50b5fe9b9f4270':
  log: Fix warning with __USE_MINGW_ANSI_STDIO
This commit is contained in:
Mark Salyzyn 2014-06-13 14:37:40 +00:00 committed by Android Git Automerger
commit c3e2366602

View file

@ -98,11 +98,15 @@ int __android_log_write(int prio, const char *tag, const char *text);
*/
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 @@ void __android_log_assert(const char *cond, const char *tag,
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
;