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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
diff -Naur chinput.orig/src/IMdkit/lib/FrameMgr.c chinput-3.0.2/src/IMdkit/lib/FrameMgr.c
--- chinput.orig/src/IMdkit/lib/FrameMgr.c Sat Jul 1 21:01:01 2000
+++ chinput-3.0.2/src/IMdkit/lib/FrameMgr.c Fri Nov 16 15:28:48 2001
@@ -28,6 +28,7 @@
#include <X11/Xlibint.h>
#include <stdlib.h>
+#include <stdint.h> /* uintptr_t */
#include "FrameMgr.h"
/* Convenient macro */
@@ -909,8 +910,8 @@
register int offset, iter_idx;
info->counter.is_byte_len =
- (((int) fi->template[fi->cur_no].data & 0xFF)) == FmCounterByte;
- offset = ((int) fi->template[fi->cur_no].data) >> 8;
+ (((uintptr_t) fi->template[fi->cur_no].data & 0xFF)) == FmCounterByte;
+ offset = ((uintptr_t) fi->template[fi->cur_no].data) >> 8;
iter_idx = fi->cur_no + offset;
if (fi->template[iter_idx].type == ITER)
{
@@ -958,8 +959,8 @@
register int size;
register int i;
- unit = _UNIT ((int) fi->template[fi->cur_no].data);
- number = _NUMBER ((int) fi->template[fi->cur_no].data);
+ unit = _UNIT ((uintptr_t) fi->template[fi->cur_no].data);
+ number = _NUMBER ((uintptr_t) fi->template[fi->cur_no].data);
i = fi->cur_no;
size = 0;
@@ -1058,8 +1059,8 @@
register int iter_idx;
info->counter.is_byte_len =
- (((int) fi->template[fi->cur_no].data) & 0xFF) == FmCounterByte;
- offset = ((int)fi->template[fi->cur_no].data) >> 8;
+ (((uintptr_t) fi->template[fi->cur_no].data) & 0xFF) == FmCounterByte;
+ offset = ((uintptr_t)fi->template[fi->cur_no].data) >> 8;
iter_idx = fi->cur_no + offset;
if (fi->template[iter_idx].type == ITER)
{
@@ -1105,8 +1106,8 @@
register size;
register i;
- unit = _UNIT ((int) fi->template[fi->cur_no].data);
- number = _NUMBER ((int) fi->template[fi->cur_no].data);
+ unit = _UNIT ((uintptr_t) fi->template[fi->cur_no].data);
+ number = _NUMBER ((uintptr_t) fi->template[fi->cur_no].data);
i = fi->cur_no;
size = 0;
@@ -2350,8 +2351,8 @@
register int size;
register int i;
- unit = _UNIT ((int) fi->template[cur_no].data);
- number = _NUMBER ((int) fi->template[cur_no].data);
+ unit = _UNIT ((uintptr_t) fi->template[cur_no].data);
+ number = _NUMBER ((uintptr_t) fi->template[cur_no].data);
i = cur_no;
size = 0;
diff -Naur chinput.orig/src/IMdkit/lib/IMValues.c chinput-3.0.2/src/IMdkit/lib/IMValues.c
--- chinput.orig/src/IMdkit/lib/IMValues.c Sat Jul 1 21:01:01 2000
+++ chinput-3.0.2/src/IMdkit/lib/IMValues.c Fri Nov 16 15:22:14 2001
@@ -32,6 +32,7 @@
#include <X11/Xlib.h>
#include "IMdkit.h"
#include <stdarg.h>
+#include <stdlib.h> /* malloc(3) ! */
#define Va_start(a,b) va_start(a,b)
|
