summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorTreehugger Robot2018-06-26 14:47:53 -0500
committerGerrit Code Review2018-06-26 14:47:53 -0500
commitb8f4fe4fd46fb9c5e1f53d4f3fcc87c7bd63ee7d (patch)
treebb59937427270405de6c99de7aa15707846d9b43 /liblog
parentb0ea3d38b4e61b6d9705004e6f255164c7617213 (diff)
parenta2df1ef4413144fe7d09a22f4750df05e83c13fb (diff)
downloadplatform-system-core-b8f4fe4fd46fb9c5e1f53d4f3fcc87c7bd63ee7d.tar.gz
platform-system-core-b8f4fe4fd46fb9c5e1f53d4f3fcc87c7bd63ee7d.tar.xz
platform-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.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