From 92c6b825ad27e790b5ebd7076bd9b9ef3d5815ce Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Tue, 17 May 2016 15:20:14 -0700 Subject: [PATCH] Fix misc-macro-parentheses warnings. Bug: 28705665 Change-Id: I1ad468741c6f117817099d2ba87374dce2b776a9 --- drm/common/IDrmManagerService.cpp | 2 +- drm/common/ReadWriteUtils.cpp | 2 +- drm/drmserver/DrmManager.cpp | 2 +- drm/libdrmframework/DrmManagerClientImpl.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp index f2e14b6f55..1614e2613d 100644 --- a/drm/common/IDrmManagerService.cpp +++ b/drm/common/IDrmManagerService.cpp @@ -33,7 +33,7 @@ #include "IDrmManagerService.h" -#define INVALID_BUFFER_LENGTH -1 +#define INVALID_BUFFER_LENGTH (-1) #define MAX_BINDER_TRANSACTION_SIZE ((1*1024*1024)-(4096*2)) using namespace android; diff --git a/drm/common/ReadWriteUtils.cpp b/drm/common/ReadWriteUtils.cpp index d696f163b4..16b5b34131 100644 --- a/drm/common/ReadWriteUtils.cpp +++ b/drm/common/ReadWriteUtils.cpp @@ -30,7 +30,7 @@ using namespace android; -#define FAILURE -1 +#define FAILURE (-1) String8 ReadWriteUtils::readBytes(const String8& filePath) { FILE* file = NULL; diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index 7c53feae71..18b9a3b51b 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp @@ -33,7 +33,7 @@ #include "DrmManager.h" #include "ReadWriteUtils.h" -#define DECRYPT_FILE_ERROR -1 +#define DECRYPT_FILE_ERROR (-1) using namespace android; diff --git a/drm/libdrmframework/DrmManagerClientImpl.cpp b/drm/libdrmframework/DrmManagerClientImpl.cpp index 6afb23bc4a..2296d93e70 100644 --- a/drm/libdrmframework/DrmManagerClientImpl.cpp +++ b/drm/libdrmframework/DrmManagerClientImpl.cpp @@ -28,7 +28,7 @@ using namespace android; -#define INVALID_VALUE -1 +#define INVALID_VALUE (-1) Mutex DrmManagerClientImpl::sMutex; sp DrmManagerClientImpl::sDrmManagerService;