diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2017-08-01 23:38:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 23:38:19 +0000 |
| commit | b7486369df4cbc0921c78649c88a7e7f9dc3a900 (patch) | |
| tree | eca1196051f5ac4ff5da4912ad084e09c462b5b7 /liblog | |
| parent | 48b9bccf48d73f92c3bf9d3d7fcedb48f9d5443a (diff) | |
| parent | c3357de3fd7cfa423bce083fb72d930853e9ee20 (diff) | |
| download | system_core-b7486369df4cbc0921c78649c88a7e7f9dc3a900.tar.gz system_core-b7486369df4cbc0921c78649c88a7e7f9dc3a900.tar.bz2 system_core-b7486369df4cbc0921c78649c88a7e7f9dc3a900.zip | |
Merge "Fix misc-macro-parentheses warnings in system/core." am: e4bd153e55 am: dfaa20c069 am: 3d0ff4ee98
am: c3357de3fd
Change-Id: I3c3c048851fe44a260a7f952b89d5b5dd72a4b4e
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/include/log/log_main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/liblog/include/log/log_main.h b/liblog/include/log/log_main.h index 68c2e9af6..339a06d86 100644 --- a/liblog/include/log/log_main.h +++ b/liblog/include/log/log_main.h @@ -354,11 +354,11 @@ int __android_log_is_loggable_len(int prio, const char* tag, size_t len, #if LOG_NDEBUG /* Production */ #define android_testLog(prio, tag) \ - (__android_log_is_loggable_len(prio, tag, (tag && *tag) ? strlen(tag) : 0, \ + (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \ ANDROID_LOG_DEBUG) != 0) #else #define android_testLog(prio, tag) \ - (__android_log_is_loggable_len(prio, tag, (tag && *tag) ? strlen(tag) : 0, \ + (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \ ANDROID_LOG_VERBOSE) != 0) #endif |