diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-26 19:47:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-26 19:47:53 +0000 |
commit | b8f4fe4fd46fb9c5e1f53d4f3fcc87c7bd63ee7d (patch) | |
tree | bb59937427270405de6c99de7aa15707846d9b43 /liblog | |
parent | b0ea3d38b4e61b6d9705004e6f255164c7617213 (diff) | |
parent | a2df1ef4413144fe7d09a22f4750df05e83c13fb (diff) | |
download | system_core-b8f4fe4fd46fb9c5e1f53d4f3fcc87c7bd63ee7d.tar.gz system_core-b8f4fe4fd46fb9c5e1f53d4f3fcc87c7bd63ee7d.tar.bz2 system_core-b8f4fe4fd46fb9c5e1f53d4f3fcc87c7bd63ee7d.zip |
Merge changes from topic "mingw-clang"
* changes:
Do not customize __format__ for Windows/MinGW to gnu_printf
Adapt to switch to Clang for Windows host builds
Update cflags for building Windows modules with Clang
Diffstat (limited to 'liblog')
-rw-r--r-- | liblog/include/android/log.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/liblog/include/android/log.h b/liblog/include/android/log.h index 52cbe8b71..ee9220d4a 100644 --- a/liblog/include/android/log.h +++ b/liblog/include/android/log.h @@ -115,16 +115,8 @@ 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 ; /** @@ -133,16 +125,8 @@ int __android_log_print(int prio, const char* tag, const char* fmt, ...) */ int __android_log_vprint(int prio, const char* tag, const char* fmt, va_list ap) #if defined(__GNUC__) -#ifdef __USE_MINGW_ANSI_STDIO -#if __USE_MINGW_ANSI_STDIO - __attribute__((__format__(gnu_printf, 3, 0))) -#else - __attribute__((__format__(printf, 3, 0))) -#endif -#else __attribute__((__format__(printf, 3, 0))) #endif -#endif ; /** @@ -164,16 +148,8 @@ 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 ; #ifndef log_id_t_defined |