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

diff --git a/third_party/glu/gluos.h b/third_party/glu/gluos.h
index 3b651e9..3290a77 100644 (file)
--- 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