1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Index: quesoglc-0.7.2/src/scalable.c
===================================================================
--- quesoglc-0.7.2.orig/src/scalable.c
+++ quesoglc-0.7.2/src/scalable.c
@@ -597,15 +597,14 @@ void __glcRenderCharScalable(__GLCfont*
gluTessProperty(tess, GLU_TESS_BOUNDARY_ONLY, GL_FALSE);
gluTessCallback(tess, GLU_TESS_ERROR,
- (void (CALLBACK *) (GLenum))__glcCallbackError);
+ (void (CALLBACK *) (void))__glcCallbackError);
gluTessCallback(tess, GLU_TESS_VERTEX_DATA,
- (void (CALLBACK *) (void*, void*))__glcVertexCallback);
+ (void (CALLBACK *) (void))__glcVertexCallback);
gluTessCallback(tess, GLU_TESS_COMBINE_DATA,
- (void (CALLBACK *) (GLdouble[3], void*[4],
- GLfloat[4], void**, void*))
+ (void (CALLBACK *) (void))
__glcCombineCallback);
gluTessCallback(tess, GLU_TESS_BEGIN_DATA,
- (void (CALLBACK *) (GLenum, void*))__glcBeginCallback);
+ (void (CALLBACK *) (void))__glcBeginCallback);
gluTessNormal(tess, 0., 0., 1.);
Index: quesoglc-0.7.2/src/unicode.c
===================================================================
--- quesoglc-0.7.2.orig/src/unicode.c
+++ quesoglc-0.7.2/src/unicode.c
@@ -650,7 +650,7 @@ GLCchar32* __glcConvertToVisualUcs4(__GL
if (length) {
visualString = string + length + 1;
- if (!fribidi_log2vis(string, length, &base, visualString, NULL, NULL,
+ if (!fribidi_log2vis(string, length, (void*)&base, visualString, NULL, NULL,
NULL)) {
__glcRaiseError(GLC_RESOURCE_ERROR);
return NULL;
@@ -762,7 +762,7 @@ GLCchar32* __glcConvertCountedStringToVi
}
visualString = string + inCount;
- if (!fribidi_log2vis(string, inCount, &base, visualString, NULL, NULL,
+ if (!fribidi_log2vis(string, inCount, (void*)&base, visualString, NULL, NULL,
NULL)) {
__glcRaiseError(GLC_RESOURCE_ERROR);
return NULL;
|
