summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2016-05-18 16:30:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-18 16:30:49 +0000
commita6f1ecc10e0d8734bac9f3a4d3290d9b1df0344b (patch)
tree4f0c7d18e621831e197479df593ac19d96c27d0f
parentd51f85a20e45aa652b24751ee8fba4f96e5f5df8 (diff)
parent5b27453aa18332f3e6a782fe37d44f91c629c46f (diff)
downloadwebview-a6f1ecc10e0d8734bac9f3a4d3290d9b1df0344b.tar.gz
Merge "Fix misc-macro-parentheses warnings." am: 8558b8c809 am: e3c2155db8
am: 5b27453aa1 * commit '5b27453aa18332f3e6a782fe37d44f91c629c46f': Fix misc-macro-parentheses warnings. Change-Id: Iae37d0bcd89b7ffd418e288f57c50753aff03344
-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 {