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 /adb/sysdeps.h | |
| 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 'adb/sysdeps.h')
| -rw-r--r-- | adb/sysdeps.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/adb/sysdeps.h b/adb/sysdeps.h index 3be99f635..fe0ecd6ea 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h @@ -41,16 +41,8 @@ // Some printf-like functions are implemented in terms of // android::base::StringAppendV, so they should use the same attribute for -// compile-time format string checking. On Windows, if the mingw version of -// vsnprintf is used in StringAppendV, use `gnu_printf' which allows z in %zd -// and PRIu64 (and related) to be recognized by the compile-time checking. +// compile-time format string checking. #define ADB_FORMAT_ARCHETYPE __printf__ -#ifdef __USE_MINGW_ANSI_STDIO -#if __USE_MINGW_ANSI_STDIO -#undef ADB_FORMAT_ARCHETYPE -#define ADB_FORMAT_ARCHETYPE gnu_printf -#endif -#endif #ifdef _WIN32 |