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
47
48
49
50
51
52
53
|
Author: Andreas Beckmann <anbe@debian.org>
Description: fix building with -Werror=int-conversion
--- a/cuneiform_src/Kern/hdebug/__snp.c
+++ b/cuneiform_src/Kern/hdebug/__snp.c
@@ -986,11 +986,11 @@ extern "C" {
void SnpDrawLine(Point16* start, Point16* end, int32_t skew,
uint32_t rgb_color, int16_t pen_width, Handle key )
{
- LDPUMA_DrawLine(NULL,start,end,skew,rgb_color,pen_width,key );
+ LDPUMA_DrawLine(NULL,start,end,skew,rgb_color,pen_width,(uint32_t)key );
};
void SnpHideLines(Handle key)
{
- LDPUMA_DeleteLines(NULL,key);
+ LDPUMA_DeleteLines(NULL,(uint32_t)key);
};
void SnpUpdateViews(void)
{
--- a/cuneiform_src/Kern/rstr/src/rcm.c
+++ b/cuneiform_src/Kern/rstr/src/rcm.c
@@ -2648,7 +2648,7 @@ int16_t text_findstat_agressive(char * w
}
jmp_buf * Control_Point() {
- return jumper;
+ return &jumper;
}
/////////////
--- a/cuneiform_src/Kern/rstr/src/match_wd.c
+++ b/cuneiform_src/Kern/rstr/src/match_wd.c
@@ -341,7 +341,7 @@ param.monitors=*((uint32_t*)points);
param.p2_active=1; //call while p2 pass
param.language=3; // LANG_RUSSIAN
-if((rc=setjmp(Control_Point())) != 0)
+if((rc=setjmp(*Control_Point())) != 0)
return FALSE;
w=match_string(ln, word, ¶m);
--- a/cuneiform_src/Kern/rblock/sources/c/ltroots.c
+++ b/cuneiform_src/Kern/rblock/sources/c/ltroots.c
@@ -112,7 +112,8 @@ int nRootStripsOffset;
Bool RootsLoadFile (char * pFilename)
{
-/* typedef int HANDLE;*/
+#undef HANDLE
+ typedef int HANDLE;
HANDLE hFile;
ROOT RootRecord;
|
