diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-03-06 09:06:43 -0500 |
|---|---|---|
| committer | Derek Sollenberger <derek@android.com> | 2012-03-06 09:44:47 -0500 |
| commit | 4f1dae40e24d57d647db01443b8bf2410514b8b5 (patch) | |
| tree | 594df3f3fc6c1d90a76691a75763ae1beacfdf98 /third_party | |
| parent | 1cab2921ab279367f8206cdadc9259d12e603548 (diff) | |
| download | external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.zip external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.tar.gz external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.tar.bz2 | |
Skia Merge (revision 3312)
This CL also includes changes made to Android's copy of
Skia in their J release branch.
Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/glu/gluos.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/glu/gluos.h b/third_party/glu/gluos.h index 5da46a5..e94c679 100644 --- a/third_party/glu/gluos.h +++ b/third_party/glu/gluos.h @@ -71,7 +71,9 @@ typedef void GLvoid; #define __gl_edgeSign Sk__gl_edgeSign #define __gl_memInit Sk__gl_memInit #define __gl_meshAddEdgeVertex Sk__gl_meshAddEdgeVertex +#ifndef NDEBUG #define __gl_meshCheckMesh Sk__gl_meshCheckMesh +#endif #define __gl_meshConnect Sk__gl_meshConnect #define __gl_meshDelete Sk__gl_meshDelete #define __gl_meshDeleteMesh Sk__gl_meshDeleteMesh |