~mkindahl/drizzle/remove-mem-casts

« back to all changes in this revision

Viewing changes to strings/ctype-uca.c

  • Committer: Brian Aker
  • Date: 2008-07-23 00:11:39 UTC
  • Revision ID: brian@tangent.org-20080723001139-967ewfngqqotwb6e
Removed final uint dead types.

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
#define MY_UCA_CMASK  255
44
44
#define MY_UCA_PSHIFT 8
45
45
 
46
 
uint16 page000data[]= { /* 0000 (4 weights per char) */
 
46
uint16_t page000data[]= { /* 0000 (4 weights per char) */
47
47
0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,
48
48
0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,
49
49
0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,
174
174
0x1094,0x0000,0x0000,0x0000, 0x105E,0x0000,0x0000,0x0000
175
175
};
176
176
 
177
 
uint16 page001data[]= { /* 0100 (3 weights per char) */
 
177
uint16_t page001data[]= { /* 0100 (3 weights per char) */
178
178
0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000,
179
179
0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000,
180
180
0x0E60,0x0000,0x0000, 0x0E60,0x0000,0x0000, 0x0E60,0x0000,0x0000,
262
262
0x0E38,0x0000,0x0000, 0x0E38,0x0000,0x0000, 0x0F8D,0x0000,0x0000,
263
263
0x0F8D,0x0000,0x0000 };
264
264
 
265
 
uint16 page002data[]= { /* 0200 (3 weights per char) */
 
265
uint16_t page002data[]= { /* 0200 (3 weights per char) */
266
266
0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000,
267
267
0x0E33,0x0000,0x0000, 0x0E8B,0x0000,0x0000, 0x0E8B,0x0000,0x0000,
268
268
0x0E8B,0x0000,0x0000, 0x0E8B,0x0000,0x0000, 0x0EFB,0x0000,0x0000,
350
350
0x0346,0x0000,0x0000, 0x0347,0x0000,0x0000, 0x0348,0x0000,0x0000,
351
351
0x0349,0x0000,0x0000 };
352
352
 
353
 
uint16 page003data[]= { /* 0300 (4 weights per char) */
 
353
uint16_t page003data[]= { /* 0300 (4 weights per char) */
354
354
0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,
355
355
0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,
356
356
0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,
481
481
0xFBC0,0x83FE,0x0000,0x0000, 0xFBC0,0x83FF,0x0000,0x0000
482
482
};
483
483
 
484
 
uint16 page004data[]= { /* 0400 (3 weights per char) */
 
484
uint16_t page004data[]= { /* 0400 (3 weights per char) */
485
485
0x1152,0x0000,0x0000, 0x1152,0x0000,0x0000, 0x1145,0x0000,0x0000,
486
486
0x114A,0x0000,0x0000, 0x115A,0x0000,0x0000, 0x1173,0x0000,0x0000,
487
487
0x1188,0x0000,0x0000, 0x118C,0x0000,0x0000, 0x1194,0x0000,0x0000,
569
569
0xFBC0,0x84FC,0x0000, 0xFBC0,0x84FD,0x0000, 0xFBC0,0x84FE,0x0000,
570
570
0xFBC0,0x84FF,0x0000 };
571
571
 
572
 
uint16 page005data[]= { /* 0500 (3 weights per char) */
 
572
uint16_t page005data[]= { /* 0500 (3 weights per char) */
573
573
0x1144,0x0000,0x0000, 0x1144,0x0000,0x0000, 0x1149,0x0000,0x0000,
574
574
0x1149,0x0000,0x0000, 0x116E,0x0000,0x0000, 0x116E,0x0000,0x0000,
575
575
0x117B,0x0000,0x0000, 0x117B,0x0000,0x0000, 0x11BD,0x0000,0x0000,
657
657
0xFBC0,0x85FC,0x0000, 0xFBC0,0x85FD,0x0000, 0xFBC0,0x85FE,0x0000,
658
658
0xFBC0,0x85FF,0x0000 };
659
659
 
660
 
uint16 page006data[]= { /* 0600 (3 weights per char) */
 
660
uint16_t page006data[]= { /* 0600 (3 weights per char) */
661
661
0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,
662
662
0x0000,0x0000,0x0000, 0xFBC0,0x8604,0x0000, 0xFBC0,0x8605,0x0000,
663
663
0xFBC0,0x8606,0x0000, 0xFBC0,0x8607,0x0000, 0xFBC0,0x8608,0x0000,
745
745
0x1392,0x0000,0x0000, 0x1347,0x0000,0x0000, 0x13B0,0x0000,0x0000,
746
746
0x13BB,0x0000,0x0000 };
747
747
 
748
 
uint16 page007data[]= { /* 0700 (3 weights per char) */
 
748
uint16_t page007data[]= { /* 0700 (3 weights per char) */
749
749
0x0270,0x0000,0x0000, 0x0260,0x0000,0x0000, 0x0261,0x0000,0x0000,
750
750
0x023F,0x0000,0x0000, 0x0240,0x0000,0x0000, 0x0241,0x0000,0x0000,
751
751
0x0242,0x0000,0x0000, 0x0243,0x0000,0x0000, 0x0244,0x0000,0x0000,
833
833
0xFBC0,0x87FC,0x0000, 0xFBC0,0x87FD,0x0000, 0xFBC0,0x87FE,0x0000,
834
834
0xFBC0,0x87FF,0x0000 };
835
835
 
836
 
uint16 page009data[]= { /* 0900 (3 weights per char) */
 
836
uint16_t page009data[]= { /* 0900 (3 weights per char) */
837
837
0xFBC0,0x8900,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,
838
838
0x0000,0x0000,0x0000, 0x155A,0x0000,0x0000, 0x155B,0x0000,0x0000,
839
839
0x155C,0x0000,0x0000, 0x155D,0x0000,0x0000, 0x155E,0x0000,0x0000,
921
921
0xFBC0,0x89FC,0x0000, 0xFBC0,0x89FD,0x0000, 0xFBC0,0x89FE,0x0000,
922
922
0xFBC0,0x89FF,0x0000 };
923
923
 
924
 
uint16 page00Adata[]= { /* 0A00 (3 weights per char) */
 
924
uint16_t page00Adata[]= { /* 0A00 (3 weights per char) */
925
925
0xFBC0,0x8A00,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,
926
926
0x0000,0x0000,0x0000, 0xFBC0,0x8A04,0x0000, 0x15E7,0x0000,0x0000,
927
927
0x15E8,0x0000,0x0000, 0x15EC,0x0000,0x0000, 0x15ED,0x0000,0x0000,
1009
1009
0xFBC0,0x8AFC,0x0000, 0xFBC0,0x8AFD,0x0000, 0xFBC0,0x8AFE,0x0000,
1010
1010
0xFBC0,0x8AFF,0x0000 };
1011
1011
 
1012
 
uint16 page00Bdata[]= { /* 0B00 (3 weights per char) */
 
1012
uint16_t page00Bdata[]= { /* 0B00 (3 weights per char) */
1013
1013
0xFBC0,0x8B00,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,
1014
1014
0x0000,0x0000,0x0000, 0xFBC0,0x8B04,0x0000, 0x165D,0x0000,0x0000,
1015
1015
0x165E,0x0000,0x0000, 0x165F,0x0000,0x0000, 0x1660,0x0000,0x0000,
1097
1097
0xFBC0,0x8BFC,0x0000, 0xFBC0,0x8BFD,0x0000, 0xFBC0,0x8BFE,0x0000,
1098
1098
0xFBC0,0x8BFF,0x0000 };
1099
1099
 
1100
 
uint16 page00Cdata[]= { /* 0C00 (3 weights per char) */
 
1100
uint16_t page00Cdata[]= { /* 0C00 (3 weights per char) */
1101
1101
0xFBC0,0x8C00,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,
1102
1102
0x0000,0x0000,0x0000, 0xFBC0,0x8C04,0x0000, 0x16CD,0x0000,0x0000,
1103
1103
0x16CE,0x0000,0x0000, 0x16CF,0x0000,0x0000, 0x16D0,0x0000,0x0000,
1185
1185
0xFBC0,0x8CFC,0x0000, 0xFBC0,0x8CFD,0x0000, 0xFBC0,0x8CFE,0x0000,
1186
1186
0xFBC0,0x8CFF,0x0000 };
1187
1187
 
1188
 
uint16 page00Ddata[]= { /* 0D00 (3 weights per char) */
 
1188
uint16_t page00Ddata[]= { /* 0D00 (3 weights per char) */
1189
1189
0xFBC0,0x8D00,0x0000, 0xFBC0,0x8D01,0x0000, 0x0000,0x0000,0x0000,
1190
1190
0x0000,0x0000,0x0000, 0xFBC0,0x8D04,0x0000, 0x1755,0x0000,0x0000,
1191
1191
0x1756,0x0000,0x0000, 0x1757,0x0000,0x0000, 0x1758,0x0000,0x0000,
1273
1273
0xFBC0,0x8DFC,0x0000, 0xFBC0,0x8DFD,0x0000, 0xFBC0,0x8DFE,0x0000,
1274
1274
0xFBC0,0x8DFF,0x0000 };
1275
1275
 
1276
 
uint16 page00Edata[]= { /* 0E00 (3 weights per char) */
 
1276
uint16_t page00Edata[]= { /* 0E00 (3 weights per char) */
1277
1277
0xFBC0,0x8E00,0x0000, 0x17E4,0x0000,0x0000, 0x17E5,0x0000,0x0000,
1278
1278
0x17E6,0x0000,0x0000, 0x17E7,0x0000,0x0000, 0x17E8,0x0000,0x0000,
1279
1279
0x17E9,0x0000,0x0000, 0x17EA,0x0000,0x0000, 0x17EB,0x0000,0x0000,
1361
1361
0xFBC0,0x8EFC,0x0000, 0xFBC0,0x8EFD,0x0000, 0xFBC0,0x8EFE,0x0000,
1362
1362
0xFBC0,0x8EFF,0x0000 };
1363
1363
 
1364
 
uint16 page00Fdata[]= { /* 0F00 (3 weights per char) */
 
1364
uint16_t page00Fdata[]= { /* 0F00 (3 weights per char) */
1365
1365
0x189A,0x18AD,0x0000, 0x035A,0x0000,0x0000, 0x035B,0x0000,0x0000,
1366
1366
0x035C,0x0000,0x0000, 0x02FE,0x0000,0x0000, 0x02FF,0x0000,0x0000,
1367
1367
0x0300,0x0000,0x0000, 0x0301,0x0000,0x0000, 0x0302,0x0000,0x0000,
1449
1449
0xFBC0,0x8FFC,0x0000, 0xFBC0,0x8FFD,0x0000, 0xFBC0,0x8FFE,0x0000,
1450
1450
0xFBC0,0x8FFF,0x0000 };
1451
1451
 
1452
 
uint16 page010data[]= { /* 1000 (3 weights per char) */
 
1452
uint16_t page010data[]= { /* 1000 (3 weights per char) */
1453
1453
0x1931,0x0000,0x0000, 0x1932,0x0000,0x0000, 0x1933,0x0000,0x0000,
1454
1454
0x1934,0x0000,0x0000, 0x1935,0x0000,0x0000, 0x1936,0x0000,0x0000,
1455
1455
0x1937,0x0000,0x0000, 0x1938,0x0000,0x0000, 0x1939,0x0000,0x0000,
1537
1537
0xFBC0,0x90FC,0x0000, 0xFBC0,0x90FD,0x0000, 0xFBC0,0x90FE,0x0000,
1538
1538
0xFBC0,0x90FF,0x0000 };
1539
1539
 
1540
 
uint16 page011data[]= { /* 1100 (3 weights per char) */
 
1540
uint16_t page011data[]= { /* 1100 (3 weights per char) */
1541
1541
0x1D62,0x0000,0x0000, 0x1D63,0x0000,0x0000, 0x1D64,0x0000,0x0000,
1542
1542
0x1D65,0x0000,0x0000, 0x1D66,0x0000,0x0000, 0x1D67,0x0000,0x0000,
1543
1543
0x1D68,0x0000,0x0000, 0x1D69,0x0000,0x0000, 0x1D6A,0x0000,0x0000,
1625
1625
0xFBC0,0x91FC,0x0000, 0xFBC0,0x91FD,0x0000, 0xFBC0,0x91FE,0x0000,
1626
1626
0xFBC0,0x91FF,0x0000 };
1627
1627
 
1628
 
uint16 page012data[]= { /* 1200 (3 weights per char) */
 
1628
uint16_t page012data[]= { /* 1200 (3 weights per char) */
1629
1629
0x141C,0x0000,0x0000, 0x141D,0x0000,0x0000, 0x141E,0x0000,0x0000,
1630
1630
0x141F,0x0000,0x0000, 0x1420,0x0000,0x0000, 0x1421,0x0000,0x0000,
1631
1631
0x1422,0x0000,0x0000, 0xFBC0,0x9207,0x0000, 0x1423,0x0000,0x0000,
1713
1713
0x1500,0x0000,0x0000, 0x1501,0x0000,0x0000, 0x1502,0x0000,0x0000,
1714
1714
0x1503,0x0000,0x0000 };
1715
1715
 
1716
 
uint16 page013data[]= { /* 1300 (3 weights per char) */
 
1716
uint16_t page013data[]= { /* 1300 (3 weights per char) */
1717
1717
0x1504,0x0000,0x0000, 0x1505,0x0000,0x0000, 0x1506,0x0000,0x0000,
1718
1718
0x1507,0x0000,0x0000, 0x1508,0x0000,0x0000, 0x1509,0x0000,0x0000,
1719
1719
0x150A,0x0000,0x0000, 0x150B,0x0000,0x0000, 0x150C,0x0000,0x0000,
1801
1801
0xFBC0,0x93FC,0x0000, 0xFBC0,0x93FD,0x0000, 0xFBC0,0x93FE,0x0000,
1802
1802
0xFBC0,0x93FF,0x0000 };
1803
1803
 
1804
 
uint16 page014data[]= { /* 1400 (3 weights per char) */
 
1804
uint16_t page014data[]= { /* 1400 (3 weights per char) */
1805
1805
0xFBC0,0x9400,0x0000, 0x1AAE,0x0000,0x0000, 0x1AAF,0x0000,0x0000,
1806
1806
0x1AB0,0x0000,0x0000, 0x1AB1,0x0000,0x0000, 0x1AB2,0x0000,0x0000,
1807
1807
0x1AB3,0x0000,0x0000, 0x1AB4,0x0000,0x0000, 0x1AB5,0x0000,0x0000,
1889
1889
0x1BA9,0x0000,0x0000, 0x1BAA,0x0000,0x0000, 0x1BAB,0x0000,0x0000,
1890
1890
0x1BAC,0x0000,0x0000 };
1891
1891
 
1892
 
uint16 page015data[]= { /* 1500 (2 weights per char) */
 
1892
uint16_t page015data[]= { /* 1500 (2 weights per char) */
1893
1893
0x1BAD,0x0000, 0x1BAE,0x0000, 0x1BAF,0x0000, 0x1BB0,0x0000,
1894
1894
0x1BB1,0x0000, 0x1BB2,0x0000, 0x1BB3,0x0000, 0x1BB4,0x0000,
1895
1895
0x1BB5,0x0000, 0x1BB6,0x0000, 0x1BB7,0x0000, 0x1BB8,0x0000,
1956
1956
0x1CB1,0x0000, 0x1CB2,0x0000, 0x1CB3,0x0000, 0x1CB4,0x0000
1957
1957
};
1958
1958
 
1959
 
uint16 page016data[]= { /* 1600 (3 weights per char) */
 
1959
uint16_t page016data[]= { /* 1600 (3 weights per char) */
1960
1960
0x1CB5,0x0000,0x0000, 0x1CB6,0x0000,0x0000, 0x1CB7,0x0000,0x0000,
1961
1961
0x1CB8,0x0000,0x0000, 0x1CB9,0x0000,0x0000, 0x1CBA,0x0000,0x0000,
1962
1962
0x1CBB,0x0000,0x0000, 0x1CBC,0x0000,0x0000, 0x1CBD,0x0000,0x0000,
2044
2044
0xFBC0,0x96FC,0x0000, 0xFBC0,0x96FD,0x0000, 0xFBC0,0x96FE,0x0000,
2045
2045
0xFBC0,0x96FF,0x0000 };
2046
2046
 
2047
 
uint16 page017data[]= { /* 1700 (3 weights per char) */
 
2047
uint16_t page017data[]= { /* 1700 (3 weights per char) */
2048
2048
0x18E2,0x0000,0x0000, 0x18E3,0x0000,0x0000, 0x18E4,0x0000,0x0000,
2049
2049
0x18E5,0x0000,0x0000, 0x18E6,0x0000,0x0000, 0x18E7,0x0000,0x0000,
2050
2050
0x18E8,0x0000,0x0000, 0x18E9,0x0000,0x0000, 0x18EA,0x0000,0x0000,
2132
2132
0xFBC0,0x97FC,0x0000, 0xFBC0,0x97FD,0x0000, 0xFBC0,0x97FE,0x0000,
2133
2133
0xFBC0,0x97FF,0x0000 };
2134
2134
 
2135
 
uint16 page018data[]= { /* 1800 (3 weights per char) */
 
2135
uint16_t page018data[]= { /* 1800 (3 weights per char) */
2136
2136
0x02F8,0x0000,0x0000, 0x025E,0x0000,0x0000, 0x0235,0x0000,0x0000,
2137
2137
0x0263,0x0000,0x0000, 0x024A,0x0000,0x0000, 0x024B,0x0000,0x0000,
2138
2138
0x0223,0x0000,0x0000, 0x0224,0x0000,0x0000, 0x0236,0x0000,0x0000,
2220
2220
0xFBC0,0x98FC,0x0000, 0xFBC0,0x98FD,0x0000, 0xFBC0,0x98FE,0x0000,
2221
2221
0xFBC0,0x98FF,0x0000 };
2222
2222
 
2223
 
uint16 page019data[]= { /* 1900 (3 weights per char) */
 
2223
uint16_t page019data[]= { /* 1900 (3 weights per char) */
2224
2224
0x18B0,0x0000,0x0000, 0x18B1,0x0000,0x0000, 0x18B2,0x0000,0x0000,
2225
2225
0x18B3,0x0000,0x0000, 0x18B4,0x0000,0x0000, 0x18B5,0x0000,0x0000,
2226
2226
0x18B6,0x0000,0x0000, 0x18B7,0x0000,0x0000, 0x18B8,0x0000,0x0000,
2308
2308
0x0397,0x0000,0x0000, 0x0398,0x0000,0x0000, 0x0399,0x0000,0x0000,
2309
2309
0x039A,0x0000,0x0000 };
2310
2310
 
2311
 
uint16 page01Ddata[]= { /* 1D00 (3 weights per char) */
 
2311
uint16_t page01Ddata[]= { /* 1D00 (3 weights per char) */
2312
2312
0x0E37,0x0000,0x0000, 0x0E3C,0x0000,0x0000, 0x0E3D,0x0000,0x0000,
2313
2313
0x0E57,0x0000,0x0000, 0x0E64,0x0000,0x0000, 0x0E71,0x0000,0x0000,
2314
2314
0x0E8A,0x0000,0x0000, 0x0E8F,0x0000,0x0000, 0x0EA8,0x0000,0x0000,
2396
2396
0xFBC0,0x9DFC,0x0000, 0xFBC0,0x9DFD,0x0000, 0xFBC0,0x9DFE,0x0000,
2397
2397
0xFBC0,0x9DFF,0x0000 };
2398
2398
 
2399
 
uint16 page01Edata[]= { /* 1E00 (3 weights per char) */
 
2399
uint16_t page01Edata[]= { /* 1E00 (3 weights per char) */
2400
2400
0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E4A,0x0000,0x0000,
2401
2401
0x0E4A,0x0000,0x0000, 0x0E4A,0x0000,0x0000, 0x0E4A,0x0000,0x0000,
2402
2402
0x0E4A,0x0000,0x0000, 0x0E4A,0x0000,0x0000, 0x0E60,0x0000,0x0000,
2484
2484
0xFBC0,0x9EFC,0x0000, 0xFBC0,0x9EFD,0x0000, 0xFBC0,0x9EFE,0x0000,
2485
2485
0xFBC0,0x9EFF,0x0000 };
2486
2486
 
2487
 
uint16 page01Fdata[]= { /* 1F00 (3 weights per char) */
 
2487
uint16_t page01Fdata[]= { /* 1F00 (3 weights per char) */
2488
2488
0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000,
2489
2489
0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000,
2490
2490
0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000,
2572
2572
0x1109,0x0000,0x0000, 0x020D,0x0000,0x0000, 0x0218,0x0000,0x0000,
2573
2573
0xFBC0,0x9FFF,0x0000 };
2574
2574
 
2575
 
uint16 page020data[]= { /* 2000 (5 weights per char) */
 
2575
uint16_t page020data[]= { /* 2000 (5 weights per char) */
2576
2576
0x0209,0x0000,0x0000,0x0000,0x0000,
2577
2577
0x0209,0x0000,0x0000,0x0000,0x0000,
2578
2578
0x0209,0x0000,0x0000,0x0000,0x0000,
2831
2831
0xFBC0,0xA0FF,0x0000,0x0000,0x0000
2832
2832
};
2833
2833
 
2834
 
uint16 page021data[]= { /* 2100 (5 weights per char) */
 
2834
uint16_t page021data[]= { /* 2100 (5 weights per char) */
2835
2835
0x0E33,0x02CC,0x0E60,0x0000,0x0000,
2836
2836
0x0E33,0x02CC,0x0FEA,0x0000,0x0000,
2837
2837
0x0E60,0x0000,0x0000,0x0000,0x0000,
3090
3090
0x0417,0x0000,0x0000,0x0000,0x0000
3091
3091
};
3092
3092
 
3093
 
uint16 page022data[]= { /* 2200 (4 weights per char) */
 
3093
uint16_t page022data[]= { /* 2200 (4 weights per char) */
3094
3094
0x0418,0x0000,0x0000,0x0000, 0x0419,0x0000,0x0000,0x0000,
3095
3095
0x041A,0x0000,0x0000,0x0000, 0x041B,0x0000,0x0000,0x0000,
3096
3096
0x041B,0x0000,0x0000,0x0000, 0x041C,0x0000,0x0000,0x0000,
3221
3221
0x04F9,0x0000,0x0000,0x0000, 0x04FA,0x0000,0x0000,0x0000
3222
3222
};
3223
3223
 
3224
 
uint16 page023data[]= { /* 2300 (3 weights per char) */
 
3224
uint16_t page023data[]= { /* 2300 (3 weights per char) */
3225
3225
0x04FB,0x0000,0x0000, 0x04FC,0x0000,0x0000, 0x04FD,0x0000,0x0000,
3226
3226
0x04FE,0x0000,0x0000, 0x04FF,0x0000,0x0000, 0x0500,0x0000,0x0000,
3227
3227
0x0501,0x0000,0x0000, 0x0502,0x0000,0x0000, 0x0503,0x0000,0x0000,
3309
3309
0xFBC0,0xA3FC,0x0000, 0xFBC0,0xA3FD,0x0000, 0xFBC0,0xA3FE,0x0000,
3310
3310
0xFBC0,0xA3FF,0x0000 };
3311
3311
 
3312
 
uint16 page024data[]= { /* 2400 (5 weights per char) */
 
3312
uint16_t page024data[]= { /* 2400 (5 weights per char) */
3313
3313
0x05CA,0x0000,0x0000,0x0000,0x0000,
3314
3314
0x05CB,0x0000,0x0000,0x0000,0x0000,
3315
3315
0x05CC,0x0000,0x0000,0x0000,0x0000,
3568
3568
0x0E29,0x0000,0x0000,0x0000,0x0000
3569
3569
};
3570
3570
 
3571
 
uint16 page025data[]= { /* 2500 (2 weights per char) */
 
3571
uint16_t page025data[]= { /* 2500 (2 weights per char) */
3572
3572
0x05FC,0x0000, 0x05FD,0x0000, 0x05FE,0x0000, 0x05FF,0x0000,
3573
3573
0x0600,0x0000, 0x0601,0x0000, 0x0602,0x0000, 0x0603,0x0000,
3574
3574
0x0604,0x0000, 0x0605,0x0000, 0x0606,0x0000, 0x0607,0x0000,
3635
3635
0x06F8,0x0000, 0x06F9,0x0000, 0x06FA,0x0000, 0x06FB,0x0000
3636
3636
};
3637
3637
 
3638
 
uint16 page026data[]= { /* 2600 (3 weights per char) */
 
3638
uint16_t page026data[]= { /* 2600 (3 weights per char) */
3639
3639
0x06FC,0x0000,0x0000, 0x06FD,0x0000,0x0000, 0x06FE,0x0000,0x0000,
3640
3640
0x06FF,0x0000,0x0000, 0x0700,0x0000,0x0000, 0x0701,0x0000,0x0000,
3641
3641
0x0702,0x0000,0x0000, 0x0703,0x0000,0x0000, 0x0704,0x0000,0x0000,
3723
3723
0xFBC0,0xA6FC,0x0000, 0xFBC0,0xA6FD,0x0000, 0xFBC0,0xA6FE,0x0000,
3724
3724
0xFBC0,0xA6FF,0x0000 };
3725
3725
 
3726
 
uint16 page027data[]= { /* 2700 (3 weights per char) */
 
3726
uint16_t page027data[]= { /* 2700 (3 weights per char) */
3727
3727
0xFBC0,0xA700,0x0000, 0x077C,0x0000,0x0000, 0x077D,0x0000,0x0000,
3728
3728
0x077E,0x0000,0x0000, 0x077F,0x0000,0x0000, 0xFBC0,0xA705,0x0000,
3729
3729
0x0780,0x0000,0x0000, 0x0781,0x0000,0x0000, 0x0782,0x0000,0x0000,
3811
3811
0x0834,0x0000,0x0000, 0x0835,0x0000,0x0000, 0x0836,0x0000,0x0000,
3812
3812
0x0837,0x0000,0x0000 };
3813
3813
 
3814
 
uint16 page028data[]= { /* 2800 (2 weights per char) */
 
3814
uint16_t page028data[]= { /* 2800 (2 weights per char) */
3815
3815
0x0A29,0x0000, 0x0A2A,0x0000, 0x0A2B,0x0000, 0x0A2C,0x0000,
3816
3816
0x0A2D,0x0000, 0x0A2E,0x0000, 0x0A2F,0x0000, 0x0A30,0x0000,
3817
3817
0x0A31,0x0000, 0x0A32,0x0000, 0x0A33,0x0000, 0x0A34,0x0000,
3878
3878
0x0B25,0x0000, 0x0B26,0x0000, 0x0B27,0x0000, 0x0B28,0x0000
3879
3879
};
3880
3880
 
3881
 
uint16 page029data[]= { /* 2900 (2 weights per char) */
 
3881
uint16_t page029data[]= { /* 2900 (2 weights per char) */
3882
3882
0x0838,0x0000, 0x0839,0x0000, 0x083A,0x0000, 0x083B,0x0000,
3883
3883
0x083C,0x0000, 0x083D,0x0000, 0x083E,0x0000, 0x083F,0x0000,
3884
3884
0x0840,0x0000, 0x0841,0x0000, 0x0842,0x0000, 0x0843,0x0000,
3945
3945
0x0296,0x0000, 0x0297,0x0000, 0x091E,0x0000, 0x091F,0x0000
3946
3946
};
3947
3947
 
3948
 
uint16 page02Adata[]= { /* 2A00 (5 weights per char) */
 
3948
uint16_t page02Adata[]= { /* 2A00 (5 weights per char) */
3949
3949
0x0920,0x0000,0x0000,0x0000,0x0000,
3950
3950
0x0921,0x0000,0x0000,0x0000,0x0000,
3951
3951
0x0922,0x0000,0x0000,0x0000,0x0000,
4204
4204
0x0A1A,0x0000,0x0000,0x0000,0x0000
4205
4205
};
4206
4206
 
4207
 
uint16 page02Bdata[]= { /* 2B00 (3 weights per char) */
 
4207
uint16_t page02Bdata[]= { /* 2B00 (3 weights per char) */
4208
4208
0x0A1B,0x0000,0x0000, 0x0A1C,0x0000,0x0000, 0x0A1D,0x0000,0x0000,
4209
4209
0x0A1E,0x0000,0x0000, 0x0A1F,0x0000,0x0000, 0x0A20,0x0000,0x0000,
4210
4210
0x0A21,0x0000,0x0000, 0x0A22,0x0000,0x0000, 0x0A23,0x0000,0x0000,
4292
4292
0xFBC0,0xABFC,0x0000, 0xFBC0,0xABFD,0x0000, 0xFBC0,0xABFE,0x0000,
4293
4293
0xFBC0,0xABFF,0x0000 };
4294
4294
 
4295
 
uint16 page02Edata[]= { /* 2E00 (3 weights per char) */
 
4295
uint16_t page02Edata[]= { /* 2E00 (3 weights per char) */
4296
4296
0xFBC0,0xAE00,0x0000, 0xFBC0,0xAE01,0x0000, 0xFBC0,0xAE02,0x0000,
4297
4297
0xFBC0,0xAE03,0x0000, 0xFBC0,0xAE04,0x0000, 0xFBC0,0xAE05,0x0000,
4298
4298
0xFBC0,0xAE06,0x0000, 0xFBC0,0xAE07,0x0000, 0xFBC0,0xAE08,0x0000,
4380
4380
0xFBC0,0xAEFC,0x0000, 0xFBC0,0xAEFD,0x0000, 0xFBC0,0xAEFE,0x0000,
4381
4381
0xFBC0,0xAEFF,0x0000 };
4382
4382
 
4383
 
uint16 page02Fdata[]= { /* 2F00 (3 weights per char) */
 
4383
uint16_t page02Fdata[]= { /* 2F00 (3 weights per char) */
4384
4384
0xFB40,0xCE00,0x0000, 0xFB40,0xCE28,0x0000, 0xFB40,0xCE36,0x0000,
4385
4385
0xFB40,0xCE3F,0x0000, 0xFB40,0xCE59,0x0000, 0xFB40,0xCE85,0x0000,
4386
4386
0xFB40,0xCE8C,0x0000, 0xFB40,0xCEA0,0x0000, 0xFB40,0xCEBA,0x0000,
4468
4468
0xFBC0,0xAFFC,0x0000, 0xFBC0,0xAFFD,0x0000, 0xFBC0,0xAFFE,0x0000,
4469
4469
0xFBC0,0xAFFF,0x0000 };
4470
4470
 
4471
 
uint16 page030data[]= { /* 3000 (3 weights per char) */
 
4471
uint16_t page030data[]= { /* 3000 (3 weights per char) */
4472
4472
0x0209,0x0000,0x0000, 0x0237,0x0000,0x0000, 0x0266,0x0000,0x0000,
4473
4473
0x02E2,0x0000,0x0000, 0x0DBB,0x0000,0x0000, 0x0E05,0x0000,0x0000,
4474
4474
0x1E5D,0x1E73,0x0000, 0x0E29,0x0000,0x0000, 0x02AE,0x0000,0x0000,
4556
4556
0x0E0B,0x0000,0x0000, 0x0E0C,0x0000,0x0000, 0x0E0C,0x0000,0x0000,
4557
4557
0x1E5B,0x1E65,0x0000 };
4558
4558
 
4559
 
uint16 page031data[]= { /* 3100 (3 weights per char) */
 
4559
uint16_t page031data[]= { /* 3100 (3 weights per char) */
4560
4560
0xFBC0,0xB100,0x0000, 0xFBC0,0xB101,0x0000, 0xFBC0,0xB102,0x0000,
4561
4561
0xFBC0,0xB103,0x0000, 0xFBC0,0xB104,0x0000, 0x1E82,0x0000,0x0000,
4562
4562
0x1E83,0x0000,0x0000, 0x1E84,0x0000,0x0000, 0x1E85,0x0000,0x0000,
4644
4644
0x1E79,0x0000,0x0000, 0x1E7A,0x0000,0x0000, 0x1E7B,0x0000,0x0000,
4645
4645
0x1E7C,0x0000,0x0000 };
4646
4646
 
4647
 
uint16 page032data[]= { /* 3200 (8 weights per char) */
 
4647
uint16_t page032data[]= { /* 3200 (8 weights per char) */
4648
4648
0x0288,0x1D62,0x0289,0x0000,0x0000,0x0000,0x0000,0x0000,
4649
4649
0x0288,0x1D64,0x0289,0x0000,0x0000,0x0000,0x0000,0x0000,
4650
4650
0x0288,0x1D65,0x0289,0x0000,0x0000,0x0000,0x0000,0x0000,
4903
4903
0xFBC0,0xB2FF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
4904
4904
};
4905
4905
 
4906
 
uint16 page033data[]= { /* 3300 (9 weights per char) */
 
4906
uint16_t page033data[]= { /* 3300 (9 weights per char) */
4907
4907
0x1E52,0x1E6B,0x0E0B,0x1E65,0x0000,0x0000,0x0000,0x0000,0x0000,
4908
4908
0x1E52,0x1E7A,0x1E6D,0x1E52,0x0000,0x0000,0x0000,0x0000,0x0000,
4909
4909
0x1E52,0x1E81,0x1E6E,0x1E52,0x0000,0x0000,0x0000,0x0000,0x0000,
5162
5162
0x0EC1,0x0E33,0x0F2E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
5163
5163
};
5164
5164
 
5165
 
uint16 page04Ddata[]= { /* 4D00 (3 weights per char) */
 
5165
uint16_t page04Ddata[]= { /* 4D00 (3 weights per char) */
5166
5166
0xFB80,0xCD00,0x0000, 0xFB80,0xCD01,0x0000, 0xFB80,0xCD02,0x0000,
5167
5167
0xFB80,0xCD03,0x0000, 0xFB80,0xCD04,0x0000, 0xFB80,0xCD05,0x0000,
5168
5168
0xFB80,0xCD06,0x0000, 0xFB80,0xCD07,0x0000, 0xFB80,0xCD08,0x0000,
5250
5250
0x0B73,0x0000,0x0000, 0x0B74,0x0000,0x0000, 0x0B75,0x0000,0x0000,
5251
5251
0x0B76,0x0000,0x0000 };
5252
5252
 
5253
 
uint16 page0A0data[]= { /* A000 (2 weights per char) */
 
5253
uint16_t page0A0data[]= { /* A000 (2 weights per char) */
5254
5254
0x1EB1,0x0000, 0x1EB2,0x0000, 0x1EB3,0x0000, 0x1EB4,0x0000,
5255
5255
0x1EB5,0x0000, 0x1EB6,0x0000, 0x1EB7,0x0000, 0x1EB8,0x0000,
5256
5256
0x1EB9,0x0000, 0x1EBA,0x0000, 0x1EBB,0x0000, 0x1EBC,0x0000,
5317
5317
0x1FAD,0x0000, 0x1FAE,0x0000, 0x1FAF,0x0000, 0x1FB0,0x0000
5318
5318
};
5319
5319
 
5320
 
uint16 page0A1data[]= { /* A100 (2 weights per char) */
 
5320
uint16_t page0A1data[]= { /* A100 (2 weights per char) */
5321
5321
0x1FB1,0x0000, 0x1FB2,0x0000, 0x1FB3,0x0000, 0x1FB4,0x0000,
5322
5322
0x1FB5,0x0000, 0x1FB6,0x0000, 0x1FB7,0x0000, 0x1FB8,0x0000,
5323
5323
0x1FB9,0x0000, 0x1FBA,0x0000, 0x1FBB,0x0000, 0x1FBC,0x0000,
5384
5384
0x20AD,0x0000, 0x20AE,0x0000, 0x20AF,0x0000, 0x20B0,0x0000
5385
5385
};
5386
5386
 
5387
 
uint16 page0A2data[]= { /* A200 (2 weights per char) */
 
5387
uint16_t page0A2data[]= { /* A200 (2 weights per char) */
5388
5388
0x20B1,0x0000, 0x20B2,0x0000, 0x20B3,0x0000, 0x20B4,0x0000,
5389
5389
0x20B5,0x0000, 0x20B6,0x0000, 0x20B7,0x0000, 0x20B8,0x0000,
5390
5390
0x20B9,0x0000, 0x20BA,0x0000, 0x20BB,0x0000, 0x20BC,0x0000,
5451
5451
0x21AD,0x0000, 0x21AE,0x0000, 0x21AF,0x0000, 0x21B0,0x0000
5452
5452
};
5453
5453
 
5454
 
uint16 page0A3data[]= { /* A300 (2 weights per char) */
 
5454
uint16_t page0A3data[]= { /* A300 (2 weights per char) */
5455
5455
0x21B1,0x0000, 0x21B2,0x0000, 0x21B3,0x0000, 0x21B4,0x0000,
5456
5456
0x21B5,0x0000, 0x21B6,0x0000, 0x21B7,0x0000, 0x21B8,0x0000,
5457
5457
0x21B9,0x0000, 0x21BA,0x0000, 0x21BB,0x0000, 0x21BC,0x0000,
5518
5518
0x22AD,0x0000, 0x22AE,0x0000, 0x22AF,0x0000, 0x22B0,0x0000
5519
5519
};
5520
5520
 
5521
 
uint16 page0A4data[]= { /* A400 (3 weights per char) */
 
5521
uint16_t page0A4data[]= { /* A400 (3 weights per char) */
5522
5522
0x22B1,0x0000,0x0000, 0x22B2,0x0000,0x0000, 0x22B3,0x0000,0x0000,
5523
5523
0x22B4,0x0000,0x0000, 0x22B5,0x0000,0x0000, 0x22B6,0x0000,0x0000,
5524
5524
0x22B7,0x0000,0x0000, 0x22B8,0x0000,0x0000, 0x22B9,0x0000,0x0000,
5606
5606
0xFBC1,0xA4FC,0x0000, 0xFBC1,0xA4FD,0x0000, 0xFBC1,0xA4FE,0x0000,
5607
5607
0xFBC1,0xA4FF,0x0000 };
5608
5608
 
5609
 
uint16 page0F9data[]= { /* F900 (3 weights per char) */
 
5609
uint16_t page0F9data[]= { /* F900 (3 weights per char) */
5610
5610
0xFB41,0x8C48,0x0000, 0xFB40,0xE6F4,0x0000, 0xFB41,0x8ECA,0x0000,
5611
5611
0xFB41,0x8CC8,0x0000, 0xFB40,0xEED1,0x0000, 0xFB40,0xCE32,0x0000,
5612
5612
0xFB40,0xD3E5,0x0000, 0xFB41,0x9F9C,0x0000, 0xFB41,0x9F9C,0x0000,
5694
5694
0xFB41,0x8B58,0x0000, 0xFB40,0xCEC0,0x0000, 0xFB41,0x8336,0x0000,
5695
5695
0xFB40,0xD23A,0x0000 };
5696
5696
 
5697
 
uint16 page0FAdata[]= { /* FA00 (3 weights per char) */
 
5697
uint16_t page0FAdata[]= { /* FA00 (3 weights per char) */
5698
5698
0xFB40,0xD207,0x0000, 0xFB40,0xDEA6,0x0000, 0xFB40,0xE2D3,0x0000,
5699
5699
0xFB40,0xFCD6,0x0000, 0xFB40,0xDB85,0x0000, 0xFB40,0xED1E,0x0000,
5700
5700
0xFB40,0xE6B4,0x0000, 0xFB41,0x8F3B,0x0000, 0xFB41,0x884C,0x0000,
5782
5782
0xFBC1,0xFAFC,0x0000, 0xFBC1,0xFAFD,0x0000, 0xFBC1,0xFAFE,0x0000,
5783
5783
0xFBC1,0xFAFF,0x0000 };
5784
5784
 
5785
 
uint16 page0FBdata[]= { /* FB00 (4 weights per char) */
 
5785
uint16_t page0FBdata[]= { /* FB00 (4 weights per char) */
5786
5786
0x0EB9,0x0EB9,0x0000,0x0000, 0x0EB9,0x0EFB,0x0000,0x0000,
5787
5787
0x0EB9,0x0F2E,0x0000,0x0000, 0x0EB9,0x0EB9,0x0EFB,0x0000,
5788
5788
0x0EB9,0x0EB9,0x0F2E,0x0000, 0x0FEA,0x1002,0x0000,0x0000,
5913
5913
0x13C9,0x0000,0x0000,0x0000, 0x13C9,0x0000,0x0000,0x0000
5914
5914
};
5915
5915
 
5916
 
uint16 page0FCdata[]= { /* FC00 (3 weights per char) */
 
5916
uint16_t page0FCdata[]= { /* FC00 (3 weights per char) */
5917
5917
0x134F,0x135E,0x0000, 0x134F,0x1364,0x0000, 0x134F,0x13B0,0x0000,
5918
5918
0x134F,0x13C7,0x0000, 0x134F,0x13C8,0x0000, 0x1352,0x135E,0x0000,
5919
5919
0x1352,0x1364,0x0000, 0x1352,0x1365,0x0000, 0x1352,0x13B0,0x0000,
6001
6001
0x1381,0x13C8,0x0000, 0x1382,0x13C7,0x0000, 0x1382,0x13C8,0x0000,
6002
6002
0x1364,0x13C7,0x0000 };
6003
6003
 
6004
 
uint16 page0FDdata[]= { /* FD00 (9 weights per char) */
 
6004
uint16_t page0FDdata[]= { /* FD00 (9 weights per char) */
6005
6005
0x1364,0x13C8,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
6006
6006
0x135E,0x13C7,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
6007
6007
0x135E,0x13C8,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
6260
6260
0xFBC1,0xFDFF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
6261
6261
};
6262
6262
 
6263
 
uint16 page0FEdata[]= { /* FE00 (3 weights per char) */
 
6263
uint16_t page0FEdata[]= { /* FE00 (3 weights per char) */
6264
6264
0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,
6265
6265
0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,
6266
6266
0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,
6348
6348
0x13AB,0x1350,0x0000, 0xFBC1,0xFEFD,0x0000, 0xFBC1,0xFEFE,0x0000,
6349
6349
0x0000,0x0000,0x0000 };
6350
6350
 
6351
 
uint16 page0FFdata[]= { /* FF00 (3 weights per char) */
 
6351
uint16_t page0FFdata[]= { /* FF00 (3 weights per char) */
6352
6352
0xFBC1,0xFF00,0x0000, 0x0251,0x0000,0x0000, 0x027E,0x0000,0x0000,
6353
6353
0x02D2,0x0000,0x0000, 0x0E0F,0x0000,0x0000, 0x02D3,0x0000,0x0000,
6354
6354
0x02CF,0x0000,0x0000, 0x0277,0x0000,0x0000, 0x0288,0x0000,0x0000,
6454
6454
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
6455
6455
0,0,0,0,0,0,0,0,0,3,3,4,3,9,3,3
6456
6456
};
6457
 
uint16 *uca_weight[256]={
 
6457
uint16_t *uca_weight[256]={
6458
6458
page000data,page001data,page002data,page003data,
6459
6459
page004data,page005data,page006data,page007data,
6460
6460
NULL       ,page009data,page00Adata,page00Bdata,
6749
6749
*/
6750
6750
typedef struct my_uca_scanner_st
6751
6751
{
6752
 
  const uint16 *wbeg;   /* Beginning of the current weight string */
 
6752
  const uint16_t *wbeg; /* Beginning of the current weight string */
6753
6753
  const uchar  *sbeg;   /* Beginning of the input string          */
6754
6754
  const uchar  *send;   /* End of the input string                */
6755
6755
  uchar *uca_length;
6756
 
  uint16 **uca_weight;
6757
 
  uint16 *contractions;
6758
 
  uint16 implicit[2];
 
6756
  uint16_t **uca_weight;
 
6757
  uint16_t *contractions;
 
6758
  uint16_t implicit[2];
6759
6759
  int page;
6760
6760
  int code;
6761
6761
  CHARSET_INFO *cs;
6772
6772
  int (*next)(my_uca_scanner *scanner);
6773
6773
} my_uca_scanner_handler;
6774
6774
 
6775
 
static uint16 nochar[]= {0,0};
 
6775
static uint16_t nochar[]= {0,0};
6776
6776
 
6777
6777
 
6778
6778
#ifdef HAVE_CHARSET_ucs2
6881
6881
  
6882
6882
  do 
6883
6883
  {
6884
 
    uint16 **ucaw= scanner->uca_weight;
 
6884
    uint16_t **ucaw= scanner->uca_weight;
6885
6885
    uchar *ucal= scanner->uca_length;
6886
6886
    
6887
6887
    if (scanner->sbeg > scanner->send)
6973
6973
  
6974
6974
  do 
6975
6975
  {
6976
 
    uint16 **ucaw= scanner->uca_weight;
 
6976
    uint16_t **ucaw= scanner->uca_weight;
6977
6977
    uchar *ucal= scanner->uca_length;
6978
6978
    my_wc_t wc;
6979
6979
    int mb_len;
7338
7338
  size_t page1= wc1 >> MY_UCA_PSHIFT;
7339
7339
  size_t page2= wc2 >> MY_UCA_PSHIFT;
7340
7340
  uchar *ucal= cs->sort_order;
7341
 
  uint16 **ucaw= cs->sort_order_big;
 
7341
  uint16_t **ucaw= cs->sort_order_big;
7342
7342
  size_t length1= ucal[page1];
7343
7343
  size_t length2= ucal[page2];
7344
 
  uint16 *weight1= ucaw[page1] + (wc1 & MY_UCA_CMASK) * ucal[page1];
7345
 
  uint16 *weight2= ucaw[page2] + (wc2 & MY_UCA_CMASK) * ucal[page2];
 
7344
  uint16_t *weight1= ucaw[page1] + (wc1 & MY_UCA_CMASK) * ucal[page1];
 
7345
  uint16_t *weight2= ucaw[page2] + (wc2 & MY_UCA_CMASK) * ucal[page2];
7346
7346
  
7347
7347
  if (!weight1 || !weight2)
7348
7348
    return wc1 != wc2;
7876
7876
  MY_COLL_RULE rule[MY_MAX_COLL_RULE];
7877
7877
  char errstr[128];
7878
7878
  uchar   *newlengths;
7879
 
  uint16 **newweights;
 
7879
  uint16_t **newweights;
7880
7880
  const uchar *deflengths= uca_length;
7881
 
  uint16     **defweights= uca_weight;
 
7881
  uint16_t     **defweights= uca_weight;
7882
7882
  int rc, i;
7883
7883
  int ncontractions= 0;
7884
7884
  
7898
7898
    return 1;
7899
7899
  }
7900
7900
  
7901
 
  if (!(newweights= (uint16**) (*alloc)(256*sizeof(uint16*))))
 
7901
  if (!(newweights= (uint16_t**) (*alloc)(256*sizeof(uint16_t*))))
7902
7902
    return 1;
7903
 
  bzero(newweights, 256*sizeof(uint16*));
 
7903
  bzero(newweights, 256*sizeof(uint16_t*));
7904
7904
  
7905
7905
  if (!(newlengths= (uchar*) (*alloc)(256)))
7906
7906
    return 1;
7937
7937
    if (!newweights[pagec])
7938
7938
    {
7939
7939
      /* Alloc new page and copy the default UCA weights */
7940
 
      uint size= 256*newlengths[pagec]*sizeof(uint16);
 
7940
      uint size= 256*newlengths[pagec]*sizeof(uint16_t);
7941
7941
      
7942
 
      if (!(newweights[pagec]= (uint16*) (*alloc)(size)))
 
7942
      if (!(newweights[pagec]= (uint16_t*) (*alloc)(size)))
7943
7943
        return 1;
7944
7944
      bzero((void*) newweights[pagec], size);
7945
7945
      
7947
7947
      {
7948
7948
        memcpy(newweights[pagec] + chc*newlengths[pagec],
7949
7949
               defweights[pagec] + chc*deflengths[pagec],
7950
 
               deflengths[pagec]*sizeof(uint16));
 
7950
               deflengths[pagec]*sizeof(uint16_t));
7951
7951
      }
7952
7952
    }
7953
7953
    
7959
7959
    chb= rule[i].base & 0xFF;
7960
7960
    memcpy(newweights[pagec] + chc*newlengths[pagec],
7961
7961
           defweights[pageb] + chb*deflengths[pageb],
7962
 
           deflengths[pageb]*sizeof(uint16));
 
7962
           deflengths[pageb]*sizeof(uint16_t));
7963
7963
    /* Apply primary difference */
7964
7964
    newweights[pagec][chc*newlengths[pagec]]+= rule[i].diff[0];
7965
7965
  }
7982
7982
      8K for weights for basic latin letter pairs,
7983
7983
      plus 256 bytes for "is contraction part" flags.
7984
7984
    */
7985
 
    uint size= 0x40*0x40*sizeof(uint16) + 256;
 
7985
    uint size= 0x40*0x40*sizeof(uint16_t) + 256;
7986
7986
    char *contraction_flags;
7987
 
    if (!(cs->contractions= (uint16*) (*alloc)(size)))
 
7987
    if (!(cs->contractions= (uint16_t*) (*alloc)(size)))
7988
7988
        return 1;
7989
7989
    bzero((void*)cs->contractions, size);
7990
7990
    contraction_flags= ((char*) cs->contractions) + 0x40*0x40;
7994
7994
      {
7995
7995
        uint pageb= (rule[i].base >> 8) & 0xFF;
7996
7996
        uint chb= rule[i].base & 0xFF;
7997
 
        uint16 *offsb= defweights[pageb] + chb*deflengths[pageb];
 
7997
        uint16_t *offsb= defweights[pageb] + chb*deflengths[pageb];
7998
7998
        uint offsc;
7999
7999
        
8000
8000
        if (offsb[1] ||