summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2016-05-18 16:28:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-18 16:28:16 +0000
commit5b27453aa18332f3e6a782fe37d44f91c629c46f (patch)
tree4f0c7d18e621831e197479df593ac19d96c27d0f
parent6c28df3f4b446b5fe3c335723ee3f8fd1c07ce18 (diff)
parente3c2155db8e4b3a01a44d4949e32a0bb032ec6d5 (diff)
downloadwebview-5b27453aa18332f3e6a782fe37d44f91c629c46f.tar.gz
Merge "Fix misc-macro-parentheses warnings." am: 8558b8c809android-n-mr1-preview-2android-n-mr1-preview-1
am: e3c2155db8 * commit 'e3c2155db8e4b3a01a44d4949e32a0bb032ec6d5': Fix misc-macro-parentheses warnings. Change-Id: I42a4833a71303d939341c272f225a983c9d1165b
-rw-r--r--chromium/plat_support/draw_gl_functor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/plat_support/draw_gl_functor.cpp b/chromium/plat_support/draw_gl_functor.cpp
index c35d961..25f4877 100644
--- a/chromium/plat_support/draw_gl_functor.cpp
+++ b/chromium/plat_support/draw_gl_functor.cpp
@@ -31,7 +31,7 @@
#include <utils/Log.h>
#define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
-#define COMPILE_ASSERT(expr, err) static const char err[(expr) ? 1 : -1] = "";
+#define COMPILE_ASSERT(expr, err) static const char (err)[(expr) ? 1 : -1] = "";
namespace android {
namespace {