diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-31 21:15:10 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-31 21:15:10 +0000 |
| commit | e6ff8ab7435d92660bfc4bb967dde2df0bf3d2d4 (patch) | |
| tree | ba29c3665d5d0247a84155e93ea0716c7124bc85 /third_party | |
| parent | fa57ae7d1ec7404a654e0f32c09b698feec1b7fa (diff) | |
Rename some global symbols defined by glu's libtess which conflict with the
WebKit implementation. #define them with a prefix, as we did with the main
entry points.
Review URL: http://codereview.appspot.com/4551079/
git-svn-id: http://skia.googlecode.com/svn/trunk@1457 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/glu/gluos.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/glu/gluos.h b/third_party/glu/gluos.h index 3b651e9908..3290a778dd 100644 --- a/third_party/glu/gluos.h +++ b/third_party/glu/gluos.h @@ -54,6 +54,13 @@ typedef void GLvoid; #define gluTessEndContour Sk_gluTessEndContour #define gluTessEndPolygon Sk_gluTessEndPolygon +#define __gl_noBeginData Sk__gl_noBeginData +#define __gl_noEdgeFlagData Sk__gl_noEdgeFlagData +#define __gl_noVertexData Sk__gl_noVertexData +#define __gl_noEndData Sk__gl_noEndData +#define __gl_noErrorData Sk__gl_noErrorData +#define __gl_noCombineData Sk__gl_noCombineData + #undef MIN #undef MAX |