diff options
| author | 2016-05-20 14:41:50 -0700 | |
|---|---|---|
| committer | 2016-05-20 14:41:50 -0700 | |
| commit | 44d93a063c34db90712f158c37d9329709282b5f (patch) | |
| tree | cfdc4020aad05dc466f70ce10ec75cfc08d2134e | |
| parent | f2e886c2a7851659feb192c97e508a7952426997 (diff) | |
| parent | e375c689caefda63e5407bd6df41bece40059484 (diff) | |
resolve merge conflicts of e375c68 to nyc-dev-plus-aosp
Change-Id: Ic6b535f7b078b674603c2df6d4ff66b29ff54c26
| -rw-r--r-- | opengl/libs/hooks.h | 4 | ||||
| -rw-r--r-- | opengl/tests/angeles/demo.c | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcColorEquiv.cpp | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcCommit.cpp | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcRects.cpp | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcStress.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/opengl/libs/hooks.h b/opengl/libs/hooks.h index e14075cdb7..81dbe0e34b 100644 --- a/opengl/libs/hooks.h +++ b/opengl/libs/hooks.h @@ -56,8 +56,8 @@ namespace android { #undef GL_ENTRY #undef EGL_ENTRY -#define GL_ENTRY(_r, _api, ...) _r (*_api)(__VA_ARGS__); -#define EGL_ENTRY(_r, _api, ...) _r (*_api)(__VA_ARGS__); +#define GL_ENTRY(_r, _api, ...) _r (*(_api))(__VA_ARGS__); +#define EGL_ENTRY(_r, _api, ...) _r (*(_api))(__VA_ARGS__); struct egl_t { #include "EGL/egl_entries.in" diff --git a/opengl/tests/angeles/demo.c b/opengl/tests/angeles/demo.c index 802f3980fa..39d871e968 100644 --- a/opengl/tests/angeles/demo.c +++ b/opengl/tests/angeles/demo.c @@ -666,7 +666,7 @@ static void gluLookAt(GLfloat eyex, GLfloat eyey, GLfloat eyez, y[2] /= mag; } -#define M(row,col) m[col*4+row] +#define M(row,col) m[(col)*4+(row)] M(0, 0) = x[0]; M(0, 1) = x[1]; M(0, 2) = x[2]; diff --git a/opengl/tests/hwc/hwcColorEquiv.cpp b/opengl/tests/hwc/hwcColorEquiv.cpp index f1361b8c43..a9bbcb6f5f 100644 --- a/opengl/tests/hwc/hwcColorEquiv.cpp +++ b/opengl/tests/hwc/hwcColorEquiv.cpp @@ -116,7 +116,7 @@ const float defaultEndDelay = 2.0; // Default delay after rendering graphics #define CMD_START_FRAMEWORK "start 2>&1" // Macros -#define NUMA(a) (sizeof(a) / sizeof(a [0])) // Num elements in an array +#define NUMA(a) (sizeof(a) / sizeof((a)[0])) // Num elements in an array #define MEMCLR(addr, size) do { \ memset((addr), 0, (size)); \ } while (0) diff --git a/opengl/tests/hwc/hwcCommit.cpp b/opengl/tests/hwc/hwcCommit.cpp index 03647b3e75..3686dab654 100644 --- a/opengl/tests/hwc/hwcCommit.cpp +++ b/opengl/tests/hwc/hwcCommit.cpp @@ -156,7 +156,7 @@ const struct blendType { #define CMD_START_FRAMEWORK "start 2>&1" // Macros -#define NUMA(a) (sizeof(a) / sizeof(a [0])) // Num elements in an array +#define NUMA(a) (sizeof(a) / sizeof((a)[0])) // Num elements in an array // Local types class Rectangle { diff --git a/opengl/tests/hwc/hwcRects.cpp b/opengl/tests/hwc/hwcRects.cpp index 2e2b204b4d..69e56ff59b 100644 --- a/opengl/tests/hwc/hwcRects.cpp +++ b/opengl/tests/hwc/hwcRects.cpp @@ -137,7 +137,7 @@ const struct hwc_rect defaultDisplayFrame = {0, 0, 100, 100}; #define CMD_START_FRAMEWORK "start 2>&1" // Macros -#define NUMA(a) (sizeof(a) / sizeof(a [0])) // Num elements in an array +#define NUMA(a) (sizeof(a) / sizeof((a)[0])) // Num elements in an array // Local types class Rectangle { diff --git a/opengl/tests/hwc/hwcStress.cpp b/opengl/tests/hwc/hwcStress.cpp index 60c29efa4c..1469f7c76d 100644 --- a/opengl/tests/hwc/hwcStress.cpp +++ b/opengl/tests/hwc/hwcStress.cpp @@ -162,7 +162,7 @@ bool eFlag, sFlag, pFlag; #define CMD_STOP_FRAMEWORK "stop 2>&1" #define CMD_START_FRAMEWORK "start 2>&1" -#define NUMA(a) (sizeof(a) / sizeof(a [0])) +#define NUMA(a) (sizeof(a) / sizeof((a)[0])) #define MEMCLR(addr, size) do { \ memset((addr), 0, (size)); \ } while (0) |