summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2014-06-04 07:10:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-06-04 07:11:00 +0000
commit7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60 (patch)
treeaf567eedc8a6cbf2fb0a1bfd9337f05f58bae2f1 /include
parentb122da648dd1a7860776bc90b219ffa8c215faa6 (diff)
parentad832859a7ccd7ba44b6f97e0933ab0b413d62b6 (diff)
downloadsystem_core-7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60.tar.gz
system_core-7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60.tar.bz2
system_core-7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60.zip
Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
Diffstat (limited to 'include')
-rw-r--r--include/android/log.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/android/log.h b/include/android/log.h
index f5b1900ae..ad36bd223 100644
--- a/include/android/log.h
+++ b/include/android/log.h
@@ -98,8 +98,12 @@ 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__)
+#if __USE_MINGW_ANSI_STDIO
+ __attribute__ ((format(gnu_printf, 3, 4)))
+#else
__attribute__ ((format(printf, 3, 4)))
#endif
+#endif
;
/*
@@ -117,8 +121,12 @@ void __android_log_assert(const char *cond, const char *tag,
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