[Committed on behalf of scottmg@chromium.org]
Rename all __gl_ functions to Sk__gl_ to avoid conflicting with other copies
of libtess that might be statically linked by Skia clients (done via
gluos.h, rather than touching source directly).
Specfically, this is required to enable incremental linking on Windows builds
of Chromium because WebKit has a copy of libtess also.
http://code.google.com/p/chromium/issues/detail?id=92172
http://code.google.com/p/skia/issues/detail?id=338
Review URL: http://codereview.appspot.com/4853046/
git-svn-id: http://skia.googlecode.com/svn/trunk/third_party/glu@2095 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/README.skia b/README.skia
index e97261c..0b6b624 100644
--- a/README.skia
+++ b/README.skia
@@ -36,3 +36,6 @@
- In priorityq.c, render.c, and others: the construct "if(1)...else" was
replaced with "do{...}while(1)" to silence a warning-as-error in Mac builds.
+
+ - rename all __gl_ functions to Sk__gl_ to avoid conflicting with other
+ static linkers of this library.
diff --git a/gluos.h b/gluos.h
index 3290a77..5da46a5 100644
--- a/gluos.h
+++ b/gluos.h
@@ -60,6 +60,54 @@
#define __gl_noEndData Sk__gl_noEndData
#define __gl_noErrorData Sk__gl_noErrorData
#define __gl_noCombineData Sk__gl_noCombineData
+#define __gl_computeInterior Sk__gl_computeInterior
+#define __gl_dictListDelete Sk__gl_dictListDelete
+#define __gl_dictListDeleteDict Sk__gl_dictListDeleteDict
+#define __gl_dictListInsertBefore Sk__gl_dictListInsertBefore
+#define __gl_dictListNewDict Sk__gl_dictListNewDict
+#define __gl_dictListSearch Sk__gl_dictListSearch
+#define __gl_edgeEval Sk__gl_edgeEval
+#define __gl_edgeIntersect Sk__gl_edgeIntersect
+#define __gl_edgeSign Sk__gl_edgeSign
+#define __gl_memInit Sk__gl_memInit
+#define __gl_meshAddEdgeVertex Sk__gl_meshAddEdgeVertex
+#define __gl_meshCheckMesh Sk__gl_meshCheckMesh
+#define __gl_meshConnect Sk__gl_meshConnect
+#define __gl_meshDelete Sk__gl_meshDelete
+#define __gl_meshDeleteMesh Sk__gl_meshDeleteMesh
+#define __gl_meshDiscardExterior Sk__gl_meshDiscardExterior
+#define __gl_meshMakeEdge Sk__gl_meshMakeEdge
+#define __gl_meshNewMesh Sk__gl_meshNewMesh
+#define __gl_meshSetWindingNumber Sk__gl_meshSetWindingNumber
+#define __gl_meshSplice Sk__gl_meshSplice
+#define __gl_meshSplitEdge Sk__gl_meshSplitEdge
+#define __gl_meshTessellateInterior Sk__gl_meshTessellateInterior
+#define __gl_meshTessellateMonoRegion Sk__gl_meshTessellateMonoRegion
+#define __gl_meshUnion Sk__gl_meshUnion
+#define __gl_meshZapFace Sk__gl_meshZapFace
+#define __gl_pqHeapDelete Sk__gl_pqHeapDelete
+#define __gl_pqHeapDeletePriorityQ Sk__gl_pqHeapDeletePriorityQ
+#define __gl_pqHeapExtractMin Sk__gl_pqHeapExtractMin
+#define __gl_pqHeapInit Sk__gl_pqHeapInit
+#define __gl_pqHeapInsert Sk__gl_pqHeapInsert
+#define __gl_pqHeapNewPriorityQ Sk__gl_pqHeapNewPriorityQ
+#define __gl_pqSortDelete Sk__gl_pqSortDelete
+#define __gl_pqSortDeletePriorityQ Sk__gl_pqSortDeletePriorityQ
+#define __gl_pqSortExtractMin Sk__gl_pqSortExtractMin
+#define __gl_pqSortInit Sk__gl_pqSortInit
+#define __gl_pqSortInsert Sk__gl_pqSortInsert
+#define __gl_pqSortIsEmpty Sk__gl_pqSortIsEmpty
+#define __gl_pqSortMinimum Sk__gl_pqSortMinimum
+#define __gl_pqSortNewPriorityQ Sk__gl_pqSortNewPriorityQ
+#define __gl_projectPolygon Sk__gl_projectPolygon
+#define __gl_renderBoundary Sk__gl_renderBoundary
+#define __gl_renderCache Sk__gl_renderCache
+#define __gl_renderMesh Sk__gl_renderMesh
+#define __gl_transEval Sk__gl_transEval
+#define __gl_transSign Sk__gl_transSign
+#define __gl_vertCCW Sk__gl_vertCCW
+#define __gl_vertLeq Sk__gl_vertLeq
+
#undef MIN
#undef MAX
diff --git a/libtess/dict.h b/libtess/dict.h
index 7851bac..fee0769 100644
--- a/libtess/dict.h
+++ b/libtess/dict.h
@@ -42,6 +42,8 @@
#ifndef __dict_list_h_
#define __dict_list_h_
+#include <sk_glu.h>
+
/* Use #define's so that another heap implementation can use this one */
#define DictKey DictListKey
diff --git a/libtess/memalloc.h b/libtess/memalloc.h
index 1e37f7a..7133ada 100644
--- a/libtess/memalloc.h
+++ b/libtess/memalloc.h
@@ -42,6 +42,7 @@
#ifndef __memalloc_simple_h_
#define __memalloc_simple_h_
+#include <sk_glu.h>
#include <stdlib.h>
#define memRealloc realloc
