Skip to content

Commit 6ed6caa

Browse files
committed
oolite: fix GLUfuncptr compile error
Signed-off-by: wxiwnd <[email protected]>
1 parent 8a346e1 commit 6ed6caa

File tree

1 file changed

+48
-0
lines changed

1 file changed

+48
-0
lines changed
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
diff --git a/src/Core/OOPolygonSprite.m b/src/Core/OOPolygonSprite.m
2+
index 5ada443e..216d67f1 100644
3+
--- a/src/Core/OOPolygonSprite.m
4+
+++ b/src/Core/OOPolygonSprite.m
5+
@@ -115,6 +115,9 @@ static void APIENTRY TessEndCallback(void *polygonData);
6+
7+
static void APIENTRY ErrorCallback(GLenum error, void *polygonData);
8+
9+
+// this is needed to maintain compatibility with GCC 14+
10+
+typedef GLvoid (*TessFuncPtr)();
11+
+
12+
13+
@implementation OOPolygonSprite
14+
15+
@@ -283,11 +286,11 @@ static void APIENTRY ErrorCallback(GLenum error, void *polygonData);
16+
dataArray = DataArrayToPoints(&polygonData, dataArray);
17+
18+
/*** Tesselate polygon fill ***/
19+
- gluTessCallback(tesselator, GLU_TESS_BEGIN_DATA, TessBeginCallback);
20+
- gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, TessVertexCallback);
21+
- gluTessCallback(tesselator, GLU_TESS_END_DATA, TessEndCallback);
22+
- gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, ErrorCallback);
23+
- gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, TessCombineCallback);
24+
+ gluTessCallback(tesselator, GLU_TESS_BEGIN_DATA, (TessFuncPtr)TessBeginCallback);
25+
+ gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, (TessFuncPtr)TessVertexCallback);
26+
+ gluTessCallback(tesselator, GLU_TESS_END_DATA, (TessFuncPtr)TessEndCallback);
27+
+ gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, (TessFuncPtr)ErrorCallback);
28+
+ gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, (TessFuncPtr)TessCombineCallback);
29+
30+
gluTessBeginPolygon(tesselator, &polygonData);
31+
SVGDumpBeginGroup(&polygonData, @"Fill");
32+
@@ -351,11 +354,11 @@ static void APIENTRY ErrorCallback(GLenum error, void *polygonData);
33+
polygonData.generatingOutline = YES;
34+
#endif
35+
36+
- gluTessCallback(tesselator, GLU_TESS_BEGIN_DATA, TessBeginCallback);
37+
- gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, TessVertexCallback);
38+
- gluTessCallback(tesselator, GLU_TESS_END_DATA, TessEndCallback);
39+
- gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, ErrorCallback);
40+
- gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, TessCombineCallback);
41+
+ gluTessCallback(tesselator, GLU_TESS_BEGIN_DATA, (TessFuncPtr)TessBeginCallback);
42+
+ gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, (TessFuncPtr)TessVertexCallback);
43+
+ gluTessCallback(tesselator, GLU_TESS_END_DATA, (TessFuncPtr)TessEndCallback);
44+
+ gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, (TessFuncPtr)ErrorCallback);
45+
+ gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, (TessFuncPtr)TessCombineCallback);
46+
gluTessProperty(tesselator, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_POSITIVE);
47+
48+
gluTessBeginPolygon(tesselator, &polygonData);

0 commit comments

Comments
 (0)