diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-25 14:46:17 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-25 14:46:17 +0000 |
| commit | 1fa803d6b4cb9d32dcfc5808af1ab654045a2592 (patch) | |
| tree | 69f4dab3908031dd55e9f03d9e30682b433df50d /third_party/glu/gluos.h | |
| parent | 8887ede82465687355c7a1c51e4553e99b2fb15a (diff) | |
Rename glu libtess symbols. When enabled in WebKit, the internal_glu libtess
symbols in skia will collide with the same internal_ implementation in WebKit.
Rename the glu entry points with an Sk_ prefix instead. Also, unfork the
changes to the libtess source as much as possible (the same as was done in
http://trac.webkit.org/changeset/87178).
Review URL: http://codereview.appspot.com/4536080/
git-svn-id: http://skia.googlecode.com/svn/trunk@1419 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'third_party/glu/gluos.h')
| -rw-r--r-- | third_party/glu/gluos.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/third_party/glu/gluos.h b/third_party/glu/gluos.h index 6380cb2377..3b651e9908 100644 --- a/third_party/glu/gluos.h +++ b/third_party/glu/gluos.h @@ -42,6 +42,18 @@ typedef unsigned int GLenum; typedef float GLfloat; typedef void GLvoid; +#define gluNewTess Sk_gluNewTess +#define gluDeleteTess Sk_gluDeleteTess +#define gluTessProperty Sk_gluTessProperty +#define gluGetTessProperty Sk_gluGetTessProperty +#define gluTessNormal Sk_gluTessNormal +#define gluTessCallback Sk_gluTessCallback +#define gluTessVertex Sk_gluTessVertex +#define gluTessBeginPolygon Sk_gluTessBeginPolygon +#define gluTessBeginContour Sk_gluTessBeginContour +#define gluTessEndContour Sk_gluTessEndContour +#define gluTessEndPolygon Sk_gluTessEndPolygon + #undef MIN #undef MAX |