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/README.skia | |
| 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/README.skia')
| -rw-r--r-- | third_party/glu/README.skia | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/glu/README.skia b/third_party/glu/README.skia index eff4abe4a7..e97261c24c 100644 --- a/third_party/glu/README.skia +++ b/third_party/glu/README.skia @@ -8,13 +8,12 @@ LICENSE.txt in this directory. The following changes were made in order to incorporate this code: - The addition of a simplified gluos.h to eliminate operating system - dependencies. + dependencies. The entry points to the tessellator were prefixed with + Sk_ to avoid symbol collisions with any host OS version of GLU via + #defines in gluos.h. - The removal of inclusion of GL/glu.h and replacement with an - include of internal_glu.h. - - - The entry points to the tessellator were prefixed with internal_ - to avoid symbol collisions with any host OS version of GLU. + include of sk_glu.h. - In tess.c, the obsolete entry points gluBeginPolygon, gluNextContour and gluEndPolygon in tess.c were #if 0'd out. |