diff options
| author | Elliott Hughes <enh@google.com> | 2016-06-30 19:48:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-30 19:48:19 +0000 |
| commit | 60be638ae64b263b30eac19c84992d685d7d7832 (patch) | |
| tree | e2a4dd9c5a9b6b528d1d485b49a077a401a946e5 | |
| parent | 3b4e11faa814eb29f042677277005dcf9d9cdb42 (diff) | |
| parent | 8ed118db61c18e5a87f9a03a63c2de33042b6b8d (diff) | |
| download | bionic-60be638ae64b263b30eac19c84992d685d7d7832.tar.gz | |
Merge "Apparently mips and x86's va_list is a pointer type."
| -rw-r--r-- | libc/private/libc_logging.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/private/libc_logging.h b/libc/private/libc_logging.h index 4c1b731e0..aa96090fb 100644 --- a/libc/private/libc_logging.h +++ b/libc/private/libc_logging.h @@ -81,7 +81,11 @@ __noreturn void __fortify_fatal(const char* _Nonnull, ...) __printflike(1, 2); int __libc_format_buffer(char* _Nonnull buf, size_t size, const char* _Nonnull fmt, ...) __printflike(3, 4); int __libc_format_fd(int fd, const char* _Nonnull format , ...) __printflike(2, 3); int __libc_format_log(int pri, const char* _Nonnull tag, const char* _Nonnull fmt, ...) __printflike(3, 4); +#if defined(__arm__) || defined(__aarch64__) int __libc_format_log_va_list(int pri, const char* _Nonnull tag, const char* _Nonnull fmt, va_list ap); +#else +int __libc_format_log_va_list(int pri, const char* _Nonnull tag, const char* _Nonnull fmt, va_list _Nonnull ap); +#endif int __libc_write_log(int pri, const char* _Nonnull tag, const char* _Nonnull msg); __END_DECLS |