Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfaa20c0 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix misc-macro-parentheses warnings in system/core." 

am: e4bd153e

Change-Id: I6b38149a0fa15874eff68cbf7ee62e4acd41c595
parents b1c18af2 e4bd153e

libbacktrace/include/backtrace/backtrace_constants.h

+2 −2
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
// When the pid to be traced is set to this value, then trace the current

// process. If the tid value is not BACKTRACE_NO_TID, then the specified

// thread from the current process will be traced.

#define BACKTRACE_CURRENT_PROCESS -1

#define BACKTRACE_CURRENT_PROCESS (-1)

// When the tid to be traced is set to this value, then trace the specified

// current thread of the specified pid.

#define BACKTRACE_CURRENT_THREAD -1

#define BACKTRACE_CURRENT_THREAD (-1)



#define MAX_BACKTRACE_FRAMES 64

libcutils/include/cutils/list.h

+7 −7
Original line number Diff line number Diff line
@@ -34,20 +34,20 @@ struct listnode 


#define list_declare(name) \

    struct listnode name = { \

        .next = &name, \

        .prev = &name, \

        .next = &(name), \

        .prev = &(name), \

    }



#define list_for_each(node, list) \

    for (node = (list)->next; node != (list); node = node->next)

    for ((node) = (list)->next; (node) != (list); (node) = (node)->next)



#define list_for_each_reverse(node, list) \

    for (node = (list)->prev; node != (list); node = node->prev)

    for ((node) = (list)->prev; (node) != (list); (node) = (node)->prev)



#define list_for_each_safe(node, n, list) \

    for (node = (list)->next, n = node->next; \

         node != (list); \

         node = n, n = node->next)

    for ((node) = (list)->next, (n) = (node)->next; \

         (node) != (list); \

         (node) = (n), (n) = (node)->next)



static inline void list_init(struct listnode *node)

{

libcutils/include/cutils/native_handle.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ extern "C" { 


/* Declare a char array for use with native_handle_init */

#define NATIVE_HANDLE_DECLARE_STORAGE(name, maxFds, maxInts) \

    alignas(native_handle_t) char name[                            \

      sizeof(native_handle_t) + sizeof(int) * (maxFds + maxInts)]

    alignas(native_handle_t) char (name)[                            \

      sizeof(native_handle_t) + sizeof(int) * ((maxFds) + (maxInts))]



typedef struct native_handle

{

liblog/include/log/log_main.h

+2 −2
Original line number Diff line number Diff line
@@ -355,11 +355,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

libutils/include/utils/Singleton.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ private: 
#define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE)                 \

    template<> ::android::Mutex  \

        (::android::Singleton< TYPE >::sLock)(::android::Mutex::PRIVATE);  \

    template<> TYPE* ::android::Singleton< TYPE >::sInstance(0);  \

    template<> TYPE* ::android::Singleton< TYPE >::sInstance(0);  /* NOLINT */ \

    template class ::android::Singleton< TYPE >;