Mercurial > freewnn
comparison Wnn/include/jdata.h @ 27:6bfa7ea3b75b
- resolved conflict between pointer and int
- more warning suppression
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Sat, 06 Mar 2010 18:29:27 +0900 |
| parents | b605a0e60f5b |
| children |
comparison
equal
deleted
inserted
replaced
| 26:6dcfbd28e807 | 27:6bfa7ea3b75b |
|---|---|
| 34 #define WNN_JDATA_H | 34 #define WNN_JDATA_H |
| 35 | 35 |
| 36 #ifndef JS | 36 #ifndef JS |
| 37 struct jdata | 37 struct jdata |
| 38 { | 38 { |
| 39 int kanji1; | 39 int kanji1; /* index */ |
| 40 short kanji2; /* */ | 40 short kanji2; /* index */ |
| 41 short which; /* gyaku henkan? */ | 41 short which; /* gyaku henkan? */ |
| 42 int serial; /* index is a serial number of the first | 42 int serial; /* index is a serial number of the first |
| 43 entry which is stored in this entry */ | 43 entry which is stored in this entry */ |
| 44 int kosuu; /* this means the number of elements in this | 44 int kosuu; /* this means the number of elements in this |
| 45 entry */ | 45 entry */ |
| 136 #define ENDPTR 0 /* The end of (int) pointer list in uind2->next */ | 136 #define ENDPTR 0 /* The end of (int) pointer list in uind2->next */ |
| 137 #define RD_ENDPTR 0xffffffff /* The end of (int) pointer list in rind2->next */ | 137 #define RD_ENDPTR 0xffffffff /* The end of (int) pointer list in rind2->next */ |
| 138 | 138 |
| 139 struct uind1 | 139 struct uind1 |
| 140 { | 140 { |
| 141 int pter1; /* pointer to uind1 */ | 141 int pter1; /* pointer to uind1 (index?) */ |
| 142 int pter; /* pinter to uind2 */ | 142 int pter; /* pinter to uind2 (index?) */ |
| 143 unsigned int yomi1; | 143 unsigned int yomi1; |
| 144 unsigned int yomi2; | 144 unsigned int yomi2; |
| 145 }; | 145 }; |
| 146 | 146 |
| 147 struct uind2 | 147 struct uind2 |
| 148 { | 148 { |
| 149 int next; /* pointer to uind2 */ | 149 int next; /* pointer to uind2 (index?) */ |
| 150 int serial; | 150 int serial; |
| 151 int kanjipter; | 151 int kanjipter; /* index maybe */ |
| 152 w_char kosuu; | 152 w_char kosuu; |
| 153 w_char yomi[1]; /* actually it is variable length */ | 153 w_char yomi[1]; /* actually it is variable length */ |
| 154 }; | 154 }; |
| 155 | 155 |
| 156 /* MAXTABLE MAX... ha user file no ookisani kuwaete touroku no tame | 156 /* MAXTABLE MAX... ha user file no ookisani kuwaete touroku no tame |