commit 629a360ace7b3b52fa7f988934cf73e5796bb770
author Chih-Hung Hsieh <chh@google.com> Thu May 12 00:55:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 12 00:55:30 2016 +0000
tree 1835dbc15439db01704bc7cadb434d87560d74f2
parent b67768a9ece02a569b43db327f5b3b1ee6c3cbf7
parent 6e8ebe8f763bfcea9b7420e9efa62e61e2260f58

Merge "Fix misc-macro-parentheses warnings." am: 0c0f9228cf am: 4ff367a593 am: 5dc0aa6e41
am: 6e8ebe8f76

* commit '6e8ebe8f763bfcea9b7420e9efa62e61e2260f58':
  Fix misc-macro-parentheses warnings.

Change-Id: I518c580eda89fbc9f987e8ac36001b57c29f7f01

MoveTask.cpp

diff --git a/MoveTask.cpp b/MoveTask.cpp
index d416718..a6e5fed 100644
--- a/MoveTask.cpp
+++ b/MoveTask.cpp
@@ -27,7 +27,7 @@
 #include <dirent.h>
 #include <sys/wait.h>
 
-#define CONSTRAIN(amount, low, high) (amount < low ? low : (amount > high ? high : amount))
+#define CONSTRAIN(amount, low, high) ((amount) < (low) ? (low) : ((amount) > (high) ? (high) : (amount)))
 
 using android::base::StringPrintf;
 

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index ec68164..374e35f 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -63,8 +63,8 @@
 
 #define MASS_STORAGE_FILE_PATH  "/sys/class/android_usb/android0/f_mass_storage/lun/file"
 
-#define ROUND_UP_POWER_OF_2(number, po2) (((!!(number & ((1U << po2) - 1))) << po2)\
-                                         + (number & (~((1U << po2) - 1))))
+#define ROUND_UP_POWER_OF_2(number, po2) (((!!((number) & ((1U << (po2)) - 1))) << (po2))\
+                                         + ((number) & (~((1U << (po2)) - 1))))
 
 using android::base::StringPrintf;