summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorPirama Arumuga Nainar2018-06-25 13:48:58 -0500
committerPirama Arumuga Nainar2018-06-25 13:52:54 -0500
commita2df1ef4413144fe7d09a22f4750df05e83c13fb (patch)
tree703bdbfdcb8acbe75e5dfb13f492030fa72eb322 /liblog
parent8e52362e45c7d14d30c158e3c5f05e53e499bea4 (diff)
downloadplatform-system-core-a2df1ef4413144fe7d09a22f4750df05e83c13fb.tar.gz
platform-system-core-a2df1ef4413144fe7d09a22f4750df05e83c13fb.tar.xz
platform-system-core-a2df1ef4413144fe7d09a22f4750df05e83c13fb.zip
Do not customize __format__ for Windows/MinGW to gnu_printf
Bug: http://b/69933090 Bug: http://b/69933068 MinGW uses gnu_printf to force C99 printf analysis with GCC, but clang does not support gnu_printf. So just use the default that's used for other platforms. This also mirrors upstream commit https://sourceforge.net/p/mingw-w64/mingw-w64/ci/015e637b4b24d9915162ab877ed539ad0e657951/. Test: m native-host-cross with Clang. Change-Id: I3deb266d70e25296c4ae1d58637afbabc3d949c1
Diffstat (limited to 'liblog')
-rw-r--r--liblog/include/android/log.h24
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);
115 */ 115 */
116int __android_log_print(int prio, const char* tag, const char* fmt, ...) 116int __android_log_print(int prio, const char* tag, const char* fmt, ...)
117#if defined(__GNUC__) 117#if defined(__GNUC__)
118#ifdef __USE_MINGW_ANSI_STDIO
119#if __USE_MINGW_ANSI_STDIO
120 __attribute__((__format__(gnu_printf, 3, 4)))
121#else
122 __attribute__((__format__(printf, 3, 4))) 118 __attribute__((__format__(printf, 3, 4)))
123#endif 119#endif
124#else
125 __attribute__((__format__(printf, 3, 4)))
126#endif
127#endif
128 ; 120 ;
129 121
130/** 122/**
@@ -133,16 +125,8 @@ int __android_log_print(int prio, const char* tag, const char* fmt, ...)
133 */ 125 */
134int __android_log_vprint(int prio, const char* tag, const char* fmt, va_list ap) 126int __android_log_vprint(int prio, const char* tag, const char* fmt, va_list ap)
135#if defined(__GNUC__) 127#if defined(__GNUC__)
136#ifdef __USE_MINGW_ANSI_STDIO
137#if __USE_MINGW_ANSI_STDIO
138 __attribute__((__format__(gnu_printf, 3, 0)))
139#else
140 __attribute__((__format__(printf, 3, 0)))
141#endif
142#else
143 __attribute__((__format__(printf, 3, 0))) 128 __attribute__((__format__(printf, 3, 0)))
144#endif 129#endif
145#endif
146 ; 130 ;
147 131
148/** 132/**
@@ -164,16 +148,8 @@ void __android_log_assert(const char* cond, const char* tag, const char* fmt,
164 ...) 148 ...)
165#if defined(__GNUC__) 149#if defined(__GNUC__)
166 __attribute__((__noreturn__)) 150 __attribute__((__noreturn__))
167#ifdef __USE_MINGW_ANSI_STDIO
168#if __USE_MINGW_ANSI_STDIO
169 __attribute__((__format__(gnu_printf, 3, 4)))
170#else
171 __attribute__((__format__(printf, 3, 4)))
172#endif
173#else
174 __attribute__((__format__(printf, 3, 4))) 151 __attribute__((__format__(printf, 3, 4)))
175#endif 152#endif
176#endif
177 ; 153 ;
178 154
179#ifndef log_id_t_defined 155#ifndef log_id_t_defined