summaryrefslogtreecommitdiff
path: root/support/aspell/w32/aspell-0.50.4.1-vc++.diff
blob: 290ce9faf4e3d9c3cad25ddc8f584e5d1910f602 (plain)
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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
Only in aspell-win32: Debug
Only in aspell-win32: Release
Only in aspell-win32: StdAfx.cpp
Only in aspell-win32: StdAfx.h
Only in aspell-win32: aspell.cpp
Only in aspell-win32: aspell.dsp
Only in aspell-win32: aspellroot.h
diff -rubw aspell-0.50.4.1/common/asc_ctype.hpp aspell-win32/common/asc_ctype.hpp
--- aspell-0.50.4.1/common/asc_ctype.hpp	2002-07-23 22:08:14.000000000 -0400
+++ aspell-win32/common/asc_ctype.hpp	2003-12-30 09:30:08.000000000 -0500
@@ -14,7 +14,7 @@
 
   static inline bool asc_isspace(char c) 
   {
-    return c==' '|c=='\n'|c=='\r'|c=='\t'|c=='\f'|c=='\v';
+    return (c==' ')|(c=='\n')|(c=='\r')|(c=='\t')|(c=='\f')|(c=='\v');
   }
 
   static inline bool asc_isdigit(char c)
diff -rubw aspell-0.50.4.1/common/can_have_error.cpp aspell-win32/common/can_have_error.cpp
--- aspell-0.50.4.1/common/can_have_error.cpp	2002-08-26 18:01:04.000000000 -0400
+++ aspell-win32/common/can_have_error.cpp	2004-01-06 15:28:29.000000000 -0500
@@ -10,8 +10,11 @@
 
 namespace acommon {
 
+#ifdef WIN32PORT
+#else
   template void GenericCopyPtr<Error, CopyPtr<Error>::Parms>
   ::reset(Error*, CopyPtr<Error>::Parms const&);
+#endif
 
   CanHaveError::CanHaveError(Error * e)
     : err_(e)
diff -rubw aspell-0.50.4.1/common/can_have_error.hpp aspell-win32/common/can_have_error.hpp
--- aspell-0.50.4.1/common/can_have_error.hpp	2002-08-26 18:42:06.000000000 -0400
+++ aspell-win32/common/can_have_error.hpp	2004-01-06 15:28:31.000000000 -0500
@@ -9,6 +9,9 @@
 
 #include "copy_ptr.hpp"
 #include "error.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
diff -rubw aspell-0.50.4.1/common/char_vector.hpp aspell-win32/common/char_vector.hpp
--- aspell-0.50.4.1/common/char_vector.hpp	2002-08-04 02:20:32.000000000 -0400
+++ aspell-win32/common/char_vector.hpp	2004-01-06 15:28:32.000000000 -0500
@@ -9,6 +9,9 @@
 
 #include "vector.hpp"
 #include "ostream.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon 
 {
diff -rubw aspell-0.50.4.1/common/clone_ptr-t.hpp aspell-win32/common/clone_ptr-t.hpp
--- aspell-0.50.4.1/common/clone_ptr-t.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/clone_ptr-t.hpp	2004-01-06 15:28:35.000000000 -0500
@@ -15,10 +15,16 @@
 
 #include "clone_ptr.hpp"
 #include <typeinfo>
+#ifdef WIN32PORT
+#include "generic_copy_ptr.hpp"
+#else
 #include "generic_copy_ptr-t.hpp"
+#endif
 
 namespace acommon {
 
+#ifdef WIN32PORT
+#else
   template <typename T>
   inline T * ClonePtr<T>::Parms::clone(const T * ptr) const {
     return ptr->clone();
@@ -39,6 +45,7 @@
   inline void ClonePtr<T>::Parms::del(T * ptr) {
     delete ptr;
   }
+#endif
 
 }
 
diff -rubw aspell-0.50.4.1/common/clone_ptr.hpp aspell-win32/common/clone_ptr.hpp
--- aspell-0.50.4.1/common/clone_ptr.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/clone_ptr.hpp	2004-01-06 15:28:38.000000000 -0500
@@ -21,9 +21,30 @@
   class ClonePtr 
   {
     struct Parms {
+#ifdef WIN32PORT
+      T * clone(const T * ptr) const{return ptr->clone();}
+#else
       T * clone(const T * ptr) const;
+#endif
+#ifdef WIN32PORT
+      void assign(T * & rhs, const T * lhs) const{
+        if (typeid(*rhs) == typeid(*lhs)) {
+          rhs->assign(lhs);
+        } else {
+          T * temp = rhs;
+          rhs = lhs->clone();
+          delete temp;
+        }
+      }
+#else
       void assign(T * & rhs, const T * lhs) const;
+#endif
+#ifdef WIN32PORT
+      void del(T * ptr){delete ptr;}
+#else
       void del(T * ptr);
+#endif
+
     };
     GenericCopyPtr<T, Parms> impl;
 
diff -rubw aspell-0.50.4.1/common/config.cpp aspell-win32/common/config.cpp
--- aspell-0.50.4.1/common/config.cpp	2002-08-25 22:04:34.000000000 -0400
+++ aspell-win32/common/config.cpp	2004-01-06 15:28:41.000000000 -0500
@@ -9,7 +9,10 @@
 #include <assert.h>
 #include <locale.h>
 
+#ifdef WIN32PORT
+#else
 #include "dirs.h"
+#endif
 #include "settings.h"
 
 #include "asc_ctype.hpp"
@@ -283,10 +286,18 @@
     const KeyInfo * i;
   
     i = acommon::find(key, kmi.main_begin, kmi.main_end);
+#ifdef WIN32PORT
+    if (i != kmi.main_end) return ret = PosibErr<const KeyInfo*>(i); //FB
+#else
     if (i != kmi.main_end) return ret = i;
+#endif
   
+#ifdef WIN32PORT
     i = acommon::find(key, kmi.extra_begin, kmi.extra_end);
+    if (i != kmi.extra_end) return ret = PosibErr<const KeyInfo*>(i); //FB
+#else
     if (i != kmi.extra_end) return ret = i;
+#endif
   
     const char * h = strchr(key, '-');
 
@@ -301,7 +312,11 @@
       return ret.prim_err(unknown_key, key);
   
     i = acommon::find(key, j->begin, j->end);
+#ifdef WIN32PORT
+    if (i != j->end) return ret = PosibErr<const KeyInfo*>(i);   //FB
+#else
     if (i != j->end) return ret = i;
+#endif
   
     return ret.prim_err(unknown_key, key);
   }
diff -rubw aspell-0.50.4.1/common/config.hpp aspell-win32/common/config.hpp
--- aspell-0.50.4.1/common/config.hpp	2002-08-12 20:10:18.000000000 -0400
+++ aspell-win32/common/config.hpp	2004-01-02 13:01:11.000000000 -0500
@@ -93,68 +93,68 @@
     
     String temp_str;
 
-    Config(ParmString name,
+    ASPELL_API Config(ParmString name,
 	   const KeyInfo  * mainbegin, 
 	   const KeyInfo * mainend);
 
-    Config(const Config &);
-    ~Config();
-    Config & operator= (const Config &);
+    ASPELL_API Config(const Config &);
+    ASPELL_API ~Config();
+    ASPELL_API Config & operator= (const Config &);
 
-    bool get_attached() const {return attached_;}
-    void set_attached(bool a) {attached_ = a;}
+    ASPELL_API bool get_attached() const {return attached_;}
+    ASPELL_API void set_attached(bool a) {attached_ = a;}
 
-    Config * clone() const;
-    void assign(const Config * other);
+    ASPELL_API Config * clone() const;
+    ASPELL_API void assign(const Config * other);
 
-    const char * name() const {return name_.c_str();}
+    ASPELL_API const char * name() const {return name_.c_str();}
 
-    NotifierEnumeration * notifiers() const;
+    ASPELL_API NotifierEnumeration * notifiers() const;
   
-    bool add_notifier    (      Notifier *);
-    bool remove_notifier (const Notifier *);
-    bool replace_notifier(const Notifier *, Notifier *);
+    ASPELL_API bool add_notifier    (      Notifier *);
+    ASPELL_API bool remove_notifier (const Notifier *);
+    ASPELL_API bool replace_notifier(const Notifier *, Notifier *);
 
-    void set_extra(const KeyInfo * begin, const KeyInfo * end);
+    ASPELL_API void set_extra(const KeyInfo * begin, const KeyInfo * end);
 
-    void set_modules(const ConfigModule * modbegin, const ConfigModule * modend);
+    ASPELL_API void set_modules(const ConfigModule * modbegin, const ConfigModule * modend);
 
-    static const char * base_name(ParmString name);
+    ASPELL_API static const char * base_name(ParmString name);
   
-    PosibErr<const KeyInfo *> keyinfo(ParmString key) const;
+    ASPELL_API PosibErr<const KeyInfo *> keyinfo(ParmString key) const;
 
-    KeyInfoEnumeration * possible_elements(bool include_extra = true);
+    ASPELL_API KeyInfoEnumeration * possible_elements(bool include_extra = true);
 
-    StringPairEnumeration * elements();
+    ASPELL_API StringPairEnumeration * elements();
     
-    PosibErr<String> get_default (ParmString key) const;
+    ASPELL_API PosibErr<String> get_default (ParmString key) const;
 
-    PosibErr<String> retrieve    (ParmString key) const;
+    ASPELL_API PosibErr<String> retrieve    (ParmString key) const;
   
-    bool have (ParmString key) const;
+    ASPELL_API bool have (ParmString key) const;
 
-    PosibErr<void> retrieve_list (ParmString key, MutableContainer *) const;
-    PosibErr<bool> retrieve_bool (ParmString key) const;
-    PosibErr<int>  retrieve_int  (ParmString key) const;
+    ASPELL_API PosibErr<void> retrieve_list (ParmString key, MutableContainer *) const;
+    ASPELL_API PosibErr<bool> retrieve_bool (ParmString key) const;
+    ASPELL_API PosibErr<int>  retrieve_int  (ParmString key) const;
     
-    PosibErr<void> replace (ParmString, ParmString);
-    PosibErr<bool> remove  (ParmString);
+    ASPELL_API PosibErr<void> replace (ParmString, ParmString);
+    ASPELL_API PosibErr<bool> remove  (ParmString);
     
-    void write_to_stream(OStream & out, bool include_extra = false);
+    ASPELL_API void write_to_stream(OStream & out, bool include_extra = false);
 
-    PosibErr<void> read_in_settings(const Config * override = 0);
+    ASPELL_API PosibErr<void> read_in_settings(const Config * override = 0);
 
-    PosibErr<void> read_in(IStream & in);
-    PosibErr<void> read_in_file(ParmString file);
-    PosibErr<void> read_in_string(ParmString str);
+    ASPELL_API PosibErr<void> read_in(IStream & in);
+    ASPELL_API PosibErr<void> read_in_file(ParmString file);
+    ASPELL_API PosibErr<void> read_in_string(ParmString str);
 
-    void merge(const Config &);
+    ASPELL_API void merge(const Config &);
     //Note: if the same key is in both config's it is assumed that they
     // have the same data type.
   };
 
-  Config * new_config();
-  Config * new_basic_config(); // config which doesn't require any
+  ASPELL_API Config * new_config();
+  ASPELL_API Config * new_basic_config(); // config which doesn't require any
 			       // external symbols
 
   class NotifierEnumeration {
diff -rubw aspell-0.50.4.1/common/convert.cpp aspell-win32/common/convert.cpp
--- aspell-0.50.4.1/common/convert.cpp	2002-08-24 20:38:38.000000000 -0400
+++ aspell-win32/common/convert.cpp	2004-01-08 12:21:08.000000000 -0500
@@ -6,6 +6,9 @@
 
 #include <string.h>
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "asc_ctype.hpp"
 #include "convert.hpp"
 #include "fstream.hpp"
@@ -37,7 +40,11 @@
   class ToUniLookup 
   {
     Uni32 data[256];
+#ifdef WIN32PORT
+    static const Uni32 npos; // FB = (Uni32)(-1);
+#else
     static const Uni32 npos = (Uni32)(-1);
+#endif
   public:
     void reset();
     Uni32 operator[] (char key) const {return data[(unsigned char)key];}
@@ -45,6 +52,10 @@
     bool insert(char key, Uni32 value);
   };
 
+#ifdef WIN32PORT
+  const Uni32 ToUniLookup::npos = (Uni32)(-1); // FB
+#endif
+
   void ToUniLookup::reset() 
   {
     for (int i = 0; i != 256; ++i)
@@ -82,7 +93,11 @@
   {
   private:
     char unknown;
+#ifdef WIN32PORT
+    static const Uni32 npos; // FB = (Uni32)(-1);
+#else
     static const Uni32 npos = (Uni32)(-1);
+#endif
     UniItem * overflow_end;
   
     UniItem data[256*4];
@@ -96,6 +111,10 @@
     bool insert(Uni32 key, char value);
   };
 
+#ifdef WIN32PORT
+  const Uni32 FromUniLookup::npos = (Uni32)(-1); // FB
+#endif
+
   void FromUniLookup::reset()
   {
     for (unsigned int i = 0; i != 256*4; ++i)
@@ -244,8 +263,12 @@
 	for (;*in; ++in)
 	  out.append(*in);
       } else {
+#ifdef WIN32PORT
+	for (;size--; ++in)
+#else
 	const Chr * stop = reinterpret_cast<const Chr *>(in0 +size);
 	for (;in != stop; ++in)
+#endif
 	  out.append(*in);
       }
     }
diff -rubw aspell-0.50.4.1/common/convert.hpp aspell-win32/common/convert.hpp
--- aspell-0.50.4.1/common/convert.hpp	2002-08-10 12:17:06.000000000 -0400
+++ aspell-win32/common/convert.hpp	2004-01-06 15:28:48.000000000 -0500
@@ -57,7 +57,10 @@
 
     FilterCharVector buf;
 
+#ifdef WIN32PORT
+#else
     static const unsigned int null_len_ = 4; // POSIB FIXME: Be more precise
+#endif
 
   public:
 
@@ -73,11 +76,20 @@
 
     void append_null(CharVector & out) const
     {
+#ifdef WIN32PORT
+      const char nul[8] = {0, 0, 0, 0, 0 ,0 ,0, 0}; // FB // 8 should be more than enough
+      out.write(nul, /*null_len_*/4); //FB
+#else
       const char nul[8] = {0}; // 8 should be more than enough
       out.write(nul, null_len_);
+#endif
     }
 
+#ifdef WIN32PORT
+    unsigned int null_len() const {return /*null_len_*/4;}
+#else
     unsigned int null_len() const {return null_len_;}
+#endif
   
     // this filters will generally not translate null characters
     // if you need a null character at the end, add it yourself
diff -rubw aspell-0.50.4.1/common/copy_ptr-t.hpp aspell-win32/common/copy_ptr-t.hpp
--- aspell-0.50.4.1/common/copy_ptr-t.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/copy_ptr-t.hpp	2004-01-06 15:28:50.000000000 -0500
@@ -14,10 +14,16 @@
 #define autil__copy_ptr_t
 
 #include "copy_ptr.hpp"
+#ifdef WIN32PORT
+#include "generic_copy_ptr.hpp"
+#else
 #include "generic_copy_ptr-t.hpp"
+#endif
 
 namespace acommon {
 
+#ifdef WIN32PORT
+#else
   template <typename T>
   T * CopyPtr<T>::Parms::clone(const T * ptr) const {
     return new T(*ptr);
@@ -32,6 +38,7 @@
   void CopyPtr<T>::Parms::del(T * ptr) {
     delete ptr;
   }
+#endif
 }
 
 #endif
diff -rubw aspell-0.50.4.1/common/copy_ptr.hpp aspell-win32/common/copy_ptr.hpp
--- aspell-0.50.4.1/common/copy_ptr.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/copy_ptr.hpp	2004-01-06 15:28:52.000000000 -0500
@@ -13,17 +13,28 @@
 #ifndef autil__copy_ptr
 #define autil__copy_ptr
 
+#ifdef WIN32PORT
+#include "generic_copy_ptr-t.hpp" //FB
+#include "aspellroot.h"
+#else
 #include "generic_copy_ptr.hpp"
+#endif
 
 namespace acommon {
 
   template <typename T>
-  class CopyPtr 
+  class ASPELL_API CopyPtr 
   {
     struct Parms {
+#ifdef WIN32PORT
+      T * clone(const T * ptr) const {return new T(*ptr);} //FB
+      void assign(T * & rhs, const T * lhs) const{*rhs = *lhs;} //FB
+      void del(T * ptr){ delete ptr; } //FB
+#else
       T * clone(const T * ptr) const;
       void assign(T * & rhs, const T * lhs) const;
       void del(T * ptr);
+#endif
     };
     GenericCopyPtr<T, Parms> impl;
 
diff -rubw aspell-0.50.4.1/common/document_checker.hpp aspell-win32/common/document_checker.hpp
--- aspell-0.50.4.1/common/document_checker.hpp	2002-08-10 12:17:06.000000000 -0400
+++ aspell-win32/common/document_checker.hpp	2004-01-06 15:28:55.000000000 -0500
@@ -13,6 +13,9 @@
 #include "can_have_error.hpp"
 #include "filter_char.hpp"
 #include "filter_char_vector.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
@@ -35,12 +38,12 @@
     // speller expected to stick around.
     PosibErr<void> setup(Tokenizer *, Speller *, Filter *);
     void reset();
-    void process(const char * str, int size);
-    Token next_misspelling();
+    ASPELL_API void process(const char * str, int size);
+    ASPELL_API Token next_misspelling();
     
     Filter * filter() {return filter_;}
 
-    void set_status_fun(void (*)(void *, Token, int), void *); 
+    ASPELL_API void set_status_fun(void (*)(void *, Token, int), void *); 
    
     DocumentChecker();
     ~DocumentChecker();
@@ -55,7 +58,7 @@
     FilterCharVector proc_str_;
   };
 
-  PosibErr<DocumentChecker *> new_document_checker(Speller *);
+  ASPELL_API PosibErr<DocumentChecker *> new_document_checker(Speller *);
 
 }
 
diff -rubw aspell-0.50.4.1/common/enumeration.hpp aspell-win32/common/enumeration.hpp
--- aspell-0.50.4.1/common/enumeration.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/enumeration.hpp	2004-01-06 15:28:57.000000000 -0500
@@ -115,21 +115,29 @@
     }
   };
 
+
   template <class Value>
   struct MakeAlwaysEndEnumerationParms {
     Value end_state() const {return Value();}
   };
 
+#ifdef WIN32PORT
+#else
   template <class Value>
   struct MakeAlwaysEndEnumerationParms<Value *> {
     Value * end_state() const {return 0;}
   };
+#endif
   
   template <class Value> 
   class MakeAlwaysEndEnumeration : public VirEnumeration<Value> {
     MakeAlwaysEndEnumerationParms<Value> parms_;
   public:
+#ifdef WIN32PORT
+    /*MakeAlwaysEndEnumeration*/VirEnumeration<Value> * clone() const {//FB
+#else
     MakeAlwaysEndEnumeration * clone() const {
+#endif
       return new MakeAlwaysEndEnumeration(*this);
     }
     void assign(const VirEnumeration<Value> * that) {
diff -rubw aspell-0.50.4.1/common/error.hpp aspell-win32/common/error.hpp
--- aspell-0.50.4.1/common/error.hpp	2002-07-27 06:49:40.000000000 -0400
+++ aspell-win32/common/error.hpp	2004-01-06 15:28:59.000000000 -0500
@@ -7,12 +7,15 @@
 #ifndef ASPELL_ERROR__HPP
 #define ASPELL_ERROR__HPP
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
 struct ErrorInfo;
 
-struct Error {
+struct ASPELL_API Error {
   const char * mesg; // expected to be allocated with new[]
   const ErrorInfo * err;
 
@@ -25,7 +28,7 @@
   bool is_a(const ErrorInfo * e) const;
 };
 
-struct ErrorInfo {
+struct ASPELL_API ErrorInfo {
   const ErrorInfo * isa;
   const char * mesg;
   unsigned int num_parms;
diff -rubw aspell-0.50.4.1/common/errors.cpp aspell-win32/common/errors.cpp
--- aspell-0.50.4.1/common/errors.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/common/errors.cpp	2004-01-06 15:29:05.000000000 -0500
@@ -16,7 +16,11 @@
   0, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_other = &aerror_other_obj;
 
@@ -24,7 +28,11 @@
   0, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_operation_not_supported = &aerror_operation_not_supported_obj;
 
@@ -32,7 +40,11 @@
   aerror_operation_not_supported, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_cant_copy = &aerror_cant_copy_obj;
 
@@ -232,7 +244,11 @@
   0, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_pipe = &aerror_pipe_obj;
 
@@ -240,7 +256,11 @@
   aerror_pipe, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_cant_create_pipe = &aerror_cant_create_pipe_obj;
 
@@ -248,7 +268,11 @@
   aerror_pipe, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_process_died = &aerror_process_died_obj;
 
@@ -256,7 +280,11 @@
   0, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_bad_input = &aerror_bad_input_obj;
 
@@ -272,7 +300,11 @@
   aerror_bad_input, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_word_list_flags = &aerror_word_list_flags_obj;
 
@@ -280,7 +312,11 @@
   aerror_word_list_flags, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_invalid_flag = &aerror_invalid_flag_obj;
 
@@ -288,7 +324,11 @@
   aerror_word_list_flags, // isa
   0, // mesg
   0, // num_parms
+#ifdef WIN32PORT
+  {""} // FB // parms
+#else
   {} // parms
+#endif
 };
 extern "C" const ErrorInfo * const aerror_conflicting_flags = &aerror_conflicting_flags_obj;
 
diff -rubw aspell-0.50.4.1/common/errors.hpp aspell-win32/common/errors.hpp
--- aspell-0.50.4.1/common/errors.hpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/common/errors.hpp	2004-01-06 15:29:07.000000000 -0500
@@ -9,46 +9,49 @@
 #ifndef ASPELL_ERRORS__HPP
 #define ASPELL_ERRORS__HPP
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
 struct ErrorInfo;
 
-extern "C" const ErrorInfo * const aerror_other;
-extern "C" const ErrorInfo * const aerror_operation_not_supported;
-extern "C" const ErrorInfo * const   aerror_cant_copy;
-extern "C" const ErrorInfo * const aerror_file;
-extern "C" const ErrorInfo * const   aerror_cant_open_file;
-extern "C" const ErrorInfo * const     aerror_cant_read_file;
-extern "C" const ErrorInfo * const     aerror_cant_write_file;
-extern "C" const ErrorInfo * const   aerror_invalid_name;
-extern "C" const ErrorInfo * const   aerror_bad_file_format;
-extern "C" const ErrorInfo * const aerror_dir;
-extern "C" const ErrorInfo * const   aerror_cant_read_dir;
-extern "C" const ErrorInfo * const aerror_config;
-extern "C" const ErrorInfo * const   aerror_unknown_key;
-extern "C" const ErrorInfo * const   aerror_cant_change_value;
-extern "C" const ErrorInfo * const   aerror_bad_key;
-extern "C" const ErrorInfo * const   aerror_bad_value;
-extern "C" const ErrorInfo * const   aerror_duplicate;
-extern "C" const ErrorInfo * const aerror_language_related;
-extern "C" const ErrorInfo * const   aerror_unknown_language;
-extern "C" const ErrorInfo * const   aerror_unknown_soundslike;
-extern "C" const ErrorInfo * const   aerror_language_not_supported;
-extern "C" const ErrorInfo * const   aerror_no_wordlist_for_lang;
-extern "C" const ErrorInfo * const   aerror_mismatched_language;
-extern "C" const ErrorInfo * const aerror_encoding;
-extern "C" const ErrorInfo * const   aerror_unknown_encoding;
-extern "C" const ErrorInfo * const   aerror_encoding_not_supported;
-extern "C" const ErrorInfo * const   aerror_conversion_not_supported;
-extern "C" const ErrorInfo * const aerror_pipe;
-extern "C" const ErrorInfo * const   aerror_cant_create_pipe;
-extern "C" const ErrorInfo * const   aerror_process_died;
-extern "C" const ErrorInfo * const aerror_bad_input;
-extern "C" const ErrorInfo * const   aerror_invalid_word;
-extern "C" const ErrorInfo * const   aerror_word_list_flags;
-extern "C" const ErrorInfo * const     aerror_invalid_flag;
-extern "C" const ErrorInfo * const     aerror_conflicting_flags;
+extern "C" ASPELL_API const ErrorInfo * const aerror_other;
+extern "C" ASPELL_API const ErrorInfo * const aerror_operation_not_supported;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_cant_copy;
+extern "C" ASPELL_API const ErrorInfo * const aerror_file;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_cant_open_file;
+extern "C" ASPELL_API const ErrorInfo * const     aerror_cant_read_file;
+extern "C" ASPELL_API const ErrorInfo * const     aerror_cant_write_file;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_invalid_name;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_bad_file_format;
+extern "C" ASPELL_API const ErrorInfo * const aerror_dir;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_cant_read_dir;
+extern "C" ASPELL_API const ErrorInfo * const aerror_config;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_unknown_key;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_cant_change_value;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_bad_key;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_bad_value;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_duplicate;
+extern "C" ASPELL_API const ErrorInfo * const aerror_language_related;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_unknown_language;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_unknown_soundslike;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_language_not_supported;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_no_wordlist_for_lang;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_mismatched_language;
+extern "C" ASPELL_API const ErrorInfo * const aerror_encoding;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_unknown_encoding;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_encoding_not_supported;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_conversion_not_supported;
+extern "C" ASPELL_API const ErrorInfo * const aerror_pipe;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_cant_create_pipe;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_process_died;
+extern "C" ASPELL_API const ErrorInfo * const aerror_bad_input;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_invalid_word;
+extern "C" ASPELL_API const ErrorInfo * const   aerror_word_list_flags;
+extern "C" ASPELL_API const ErrorInfo * const     aerror_invalid_flag;
+extern "C" ASPELL_API const ErrorInfo * const     aerror_conflicting_flags;
 
 
 static const ErrorInfo * const other_error = aerror_other;
diff -rubw aspell-0.50.4.1/common/file_util.cpp aspell-win32/common/file_util.cpp
--- aspell-0.50.4.1/common/file_util.cpp	2002-11-04 18:39:40.000000000 -0500
+++ aspell-win32/common/file_util.cpp	2004-01-06 15:29:12.000000000 -0500
@@ -19,7 +19,12 @@
  
 // This needs to be <stdio.h> and not <cstdio>
 #include <stdio.h>
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#include <io.h> //FB (for _access)
+#else
 #include <unistd.h>
+#endif
 #include <sys/stat.h>
 
 
@@ -78,8 +83,15 @@
     fl.l_whence = SEEK_SET;
     fl.l_start  = 0;
     fl.l_len    = 0;
+#ifdef WIN32PORT
+    if (fcntl(fd, F_SETLKW, &fl) == -1) {
+      in.close();
+      return make_err(cant_read_file, file);
+    }
+#else
     fcntl(fd, F_SETLKW, &fl); // ignore errors
 #endif
+#endif
     return no_err;
   }
 
@@ -102,7 +114,12 @@
     fl.l_whence = SEEK_SET;
     fl.l_start  = 0;
     fl.l_len    = 0;
+#ifdef WIN32PORT
+    if (fcntl(fd, F_SETLKW, &fl) == -1)
+      return Ret().prim_err(cant_write_file, file);
+#else
     fcntl(fd, F_SETLKW, &fl); // ignore errors
+#endif
     struct stat s;
     fstat(fd, &s);
     return s.st_size != 0;
@@ -126,7 +143,11 @@
   }
 
   bool file_exists(ParmString name) {
+#ifdef WIN32PORT
+    return _access(name, 0) == 0;
+#else
     return access(name, F_OK) == 0;
+#endif
     //struct stat fileinfo;
     //return stat(name, &fileinfo) == 0;
   }
diff -rubw aspell-0.50.4.1/common/file_util.hpp aspell-win32/common/file_util.hpp
--- aspell-0.50.4.1/common/file_util.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/file_util.hpp	2004-01-02 12:58:34.000000000 -0500
@@ -16,21 +16,21 @@
 
   class FStream;
 
-  bool need_dir(ParmString file);
-  String add_possible_dir(ParmString dir, ParmString file);
-  String figure_out_dir(ParmString dir, ParmString file);
+  bool ASPELL_API need_dir(ParmString file);
+  String ASPELL_API add_possible_dir(ParmString dir, ParmString file);
+  String ASPELL_API figure_out_dir(ParmString dir, ParmString file);
 
   // FIXME: Possible remove
   //void open_file(FStream & in, const string & file,
   //               ParmString mode = "r");
-  time_t get_modification_time(FStream & f);
-  PosibErr<void> open_file_readlock(FStream& in, ParmString file);
-  PosibErr<bool> open_file_writelock(FStream & in, ParmString file);
+  time_t ASPELL_API get_modification_time(FStream & f);
+  PosibErr<void> ASPELL_API open_file_readlock(FStream& in, ParmString file);
+  PosibErr<bool> ASPELL_API open_file_writelock(FStream & in, ParmString file);
   // returns true if the file already exists
-  void truncate_file(FStream & f, ParmString name);
-  bool remove_file(ParmString name);
-  bool file_exists(ParmString name);
-  bool rename_file(ParmString orig, ParmString new_name);
+  void ASPELL_API truncate_file(FStream & f, ParmString name);
+  bool ASPELL_API remove_file(ParmString name);
+  bool ASPELL_API file_exists(ParmString name);
+  bool ASPELL_API rename_file(ParmString orig, ParmString new_name);
   // will return NULL if path is NULL.
   const char * get_file_name(const char * path);
 }
diff -rubw aspell-0.50.4.1/common/filter.hpp aspell-win32/common/filter.hpp
--- aspell-0.50.4.1/common/filter.hpp	2002-08-15 20:12:50.000000000 -0400
+++ aspell-win32/common/filter.hpp	2004-01-06 15:29:14.000000000 -0500
@@ -12,6 +12,9 @@
 #include "filter_char.hpp"
 #include "posib_err.hpp"
 #include "vector.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
@@ -36,7 +39,7 @@
     Filters filters_;
   };
 
-  void set_mode_from_extension(Config * config,
+  void ASPELL_API set_mode_from_extension(Config * config,
 			       ParmString filename);
   
   PosibErr<void> setup_filter(Filter &, Config *, 
diff -rubw aspell-0.50.4.1/common/filter_char.hpp aspell-win32/common/filter_char.hpp
--- aspell-0.50.4.1/common/filter_char.hpp	2002-08-20 20:47:28.000000000 -0400
+++ aspell-win32/common/filter_char.hpp	2004-01-06 15:29:17.000000000 -0500
@@ -7,9 +7,13 @@
 // license along with this library if you did not you can find
 // it at http://www.gnu.org/.
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
+
 namespace acommon {
 
-  struct FilterChar {
+  struct ASPELL_API FilterChar {
     unsigned int chr; 
     unsigned int width; // width must always be < 256
     typedef unsigned int Chr;
diff -rubw aspell-0.50.4.1/common/filter_char_vector.hpp aspell-win32/common/filter_char_vector.hpp
--- aspell-0.50.4.1/common/filter_char_vector.hpp	2002-08-11 09:58:30.000000000 -0400
+++ aspell-win32/common/filter_char_vector.hpp	2004-01-06 15:29:20.000000000 -0500
@@ -7,6 +7,9 @@
 // license along with this library if you did not you can find
 // it at http://www.gnu.org/.
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "filter_char.hpp"
 
 namespace acommon {
diff -rubw aspell-0.50.4.1/common/fstream.hpp aspell-win32/common/fstream.hpp
--- aspell-0.50.4.1/common/fstream.hpp	2002-09-18 09:38:18.000000000 -0400
+++ aspell-win32/common/fstream.hpp	2004-01-06 15:29:24.000000000 -0500
@@ -12,14 +12,20 @@
 #include "istream.hpp"
 #include "ostream.hpp"
 #include "posib_err.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 // NOTE: See iostream.hpp for the standard stream (ie standard input,
 //       output, error)
+#ifdef WIN32PORT
+using namespace std; // FB
+#endif
 
 namespace acommon {
   class String;
 
-  class FStream : public IStream, public OStream
+  class ASPELL_API FStream : public IStream, public OStream
   {
   private:
     FILE * file_;
@@ -43,7 +49,11 @@
 
     // NOTE: Use c_stream only as a last resort as it may
     //       disappear if the underlining impl changes
+#ifdef WIN32PORT
+    FILE * c_stream(); // FB
+#else
     std::FILE * c_stream();
+#endif
     // However, file_no will always be available.
     int file_no();
 
diff -rubw aspell-0.50.4.1/common/generic_copy_ptr.hpp aspell-win32/common/generic_copy_ptr.hpp
--- aspell-0.50.4.1/common/generic_copy_ptr.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/generic_copy_ptr.hpp	2004-01-06 15:29:26.000000000 -0500
@@ -13,6 +13,10 @@
 #ifndef autil__generic_copy_ptr
 #define autil__generic_copy_ptr
 
+#ifdef WIN32PORT
+#pragma warning(disable:4786)
+#endif
+
 namespace acommon {
 
   // Parms is expected to have the following members
diff -rubw aspell-0.50.4.1/common/hash-t.hpp aspell-win32/common/hash-t.hpp
--- aspell-0.50.4.1/common/hash-t.hpp	2002-08-11 09:58:30.000000000 -0400
+++ aspell-win32/common/hash-t.hpp	2004-01-16 08:50:37.000000000 -0500
@@ -84,11 +84,19 @@
   }
 
   template <class P>
+#ifdef WIN32PORT
+  std::pair< HashTable<P>::iterator,bool> HashTable<P>::insert(const Value & to_insert) //FB
+#else
   std::pair<typename HashTable<P>::iterator,bool> HashTable<P>::insert(const Value & to_insert)
+#endif
   {
     bool have;
     iterator put_me_here = find_i(parms_.key(to_insert), have);
+#ifdef WIN32PORT
+    if (have && !parms_.is_multi()) //FB
+#else
     if (have && !parms_.is_multi) 
+#endif
       return std::pair<iterator,bool>(put_me_here,false);
     Node * new_node = node_pool_.new_node();
     if (new_node == 0) {
@@ -152,7 +160,11 @@
   }
 
   template <class P>
+#ifdef WIN32PORT
+  std::pair<HashTable<P>::iterator, HashTable<P>::iterator>//FB
+#else
   std::pair<typename HashTable<P>::iterator, typename HashTable<P>::iterator>
+#endif
   HashTable<P>::equal_range_i(const Key & to_find, int & c)
   {
     c = 0;
@@ -174,6 +186,10 @@
   template <class P>
   void HashTable<P>::del() 
   {
+#ifdef WIN32PORT
+    typedef typename P::Value value_type; //FB
+    typedef value_type            Value; //FB
+#endif
     for (Node * * i = table_; i != table_end_; ++i) {
       Node * n = *i;
       while (n != 0) {
diff -rubw aspell-0.50.4.1/common/hash.hpp aspell-win32/common/hash.hpp
--- aspell-0.50.4.1/common/hash.hpp	2002-08-11 09:58:30.000000000 -0400
+++ aspell-win32/common/hash.hpp	2004-01-06 15:29:34.000000000 -0500
@@ -145,7 +145,11 @@
     const_iterator begin() const {return const_iterator(table_);}
     const_iterator end()   const {return const_iterator(table_end_,*table_end_);}
     size_type size() const  {return size_;}
+#ifdef WIN32PORT
+    bool      empty() const {return size_ + 1 != 0;}
+#else
     bool      empty() const {return size_ + 1;}
+#endif
     std::pair<iterator,bool> insert(const value_type &); 
     void erase(iterator);
     size_type erase(const key_type &);
@@ -258,9 +262,17 @@
   template <typename K, typename HF, typename E, bool m>
   struct HashSetParms 
   {
+#ifdef WIN32PORT
+    typedef K Value;
+#else
     typedef const K Value;
+#endif
     typedef const K Key;
+#ifdef WIN32PORT
+    bool is_multi(){ return m; } //FB
+#else
     static const bool is_multi = m;
+#endif
     HF hash;
     E  equal;
     const K & key(const K & v) {return v;}
@@ -294,7 +306,11 @@
   {
     typedef std::pair<const K,V> Value;
     typedef const K         Key;
+#ifdef WIN32PORT
+    bool is_multi(){ return m; } //FB
+#else
     static const bool is_multi = m;
+#endif
     HF hash;
     E  equal;
     const K & key(const Value & v) {return v.first;}
diff -rubw aspell-0.50.4.1/common/info.cpp aspell-win32/common/info.cpp
--- aspell-0.50.4.1/common/info.cpp	2002-11-25 19:21:50.000000000 -0500
+++ aspell-win32/common/info.cpp	2004-01-06 15:29:41.000000000 -0500
@@ -14,7 +14,12 @@
  /* BSDi defines u_intXX_t types in machine/types.h */
 #include <machine/types.h>
 #endif
+#ifdef WIN32PORT
+#include <windows.h> //FB
+#include <winbase.h> //FB
+#else
 #include <dirent.h>
+#endif
 
 #include "iostream.hpp"
 
@@ -33,6 +38,8 @@
 
 namespace acommon {
 
+#ifdef WIN32PORT
+#else
   class Dir {
     DIR * d_;
     Dir(const Dir &);
@@ -42,6 +49,7 @@
     Dir(DIR * d) : d_(d) {}
     ~Dir() {if (d_) closedir(d_);}
   };
+#endif
 
   /////////////////////////////////////////////////////////////////
   //
@@ -51,15 +59,26 @@
   static void get_data_dirs (Config *,
 			     StringList &);
 
-  struct DictExt
+  struct ASPELL_API DictExt
   {
+#ifdef WIN32PORT
+    static const size_t max_ext_size; // FB = 15;
+#else
     static const size_t max_ext_size = 15;
+#endif
     const ModuleInfo * module;
     size_t ext_size;
+#ifdef WIN32PORT
+    char ext[15 + 1]; //FB
+#else
     char ext[max_ext_size + 1];
+#endif
     DictExt(ModuleInfo * m, const char * e);
   };
 
+#ifdef WIN32PORT
+  const size_t DictExt::max_ext_size = 15; // FB
+#endif
   typedef Vector<DictExt> DictExtList;
 
   struct MDInfoListAll
@@ -77,8 +96,15 @@
     void fill_helper_lists(const StringList &);
   };
 
+#ifdef WIN32PORT
+  class ASPELL_API MDInfoListofLists // FB
+#else
   struct MDInfoListofLists
+#endif
   {
+#ifdef WIN32PORT
+  public://FB
+#endif
     MDInfoListAll * data;
   
     int       offset;
@@ -112,7 +138,7 @@
   // Built in modules
   //
 
-  struct ModuleInfoDefItem {
+  struct ASPELL_API ModuleInfoDefItem {
     const char * name;
     const char * data;
   };
@@ -163,12 +189,32 @@
     StringListEnumeration els = list_all.for_dirs.elements_obj();
     const char * dir;
     while ( (dir = els.next()) != 0) {
+#ifdef WIN32PORT
+      int length = strlen(dir);
+      char *buff = new char[length + 3];
+      strcpy(buff, dir);
+      buff[length] = '\\';
+      buff[length+1] = '*';
+      buff[length+2] = '\0';
+
+      WIN32_FIND_DATA fd; //FB
+      HANDLE hFile = FindFirstFile( buff/*dir*/,&fd ); //FB
+      
+      if (hFile == INVALID_HANDLE_VALUE){
+        DWORD dw = GetLastError();
+        continue; // FB
+      }
+      while(FindNextFile(hFile, &fd) != 0) {  // FB
+    
+  const char * name = fd.cFileName; // FB
+#else
       Dir d(opendir(dir));
       if (d==0) continue;
     
       struct dirent * entry;
       while ( (entry = readdir(d)) != 0) {
 	const char * name = entry->d_name;
+#endif
 	const char * dot_loc = strrchr(name, '.');
 	unsigned int name_size = dot_loc == 0 ? strlen(name) :  dot_loc - name;
       
@@ -184,6 +230,10 @@
 	RET_ON_ERR(in.open(path, "r"));
 	RET_ON_ERR(proc_info(list_all, config, name, name_size, in));
       }
+#ifdef WIN32PORT
+      FindClose(hFile); // FB
+      delete[] buff;
+#endif
     }
     return no_err;
   }
@@ -292,12 +342,30 @@
     StringListEnumeration els = list_all.dict_dirs.elements_obj();
     const char * dir;
     while ( (dir = els.next()) != 0) {
+#ifdef WIN32PORT
+      int length = strlen(dir); //FB
+      char *buff = new char[length + 3];
+      strcpy(buff, dir);
+      buff[length] = '\\';
+      buff[length+1] = '*';
+      buff[length+2] = '\0';
+
+      WIN32_FIND_DATA fd; //FB
+      HANDLE hFile = FindFirstFile( /*dir*/buff,&fd ); //FB
+      delete[] buff;//FB
+      if (hFile == INVALID_HANDLE_VALUE) continue; // FB
+      
+      while(FindNextFile(hFile, &fd) != 0) {  // FB
+    
+  const char * name = fd.cFileName; // FB
+#else
       Dir d(opendir(dir));
       if (d==0) continue;
     
       struct dirent * entry;
       while ( (entry = readdir(d)) != 0) {
 	const char * name = entry->d_name;
+#endif
 	unsigned int name_size = strlen(name);
 
 	DictExtList::const_iterator   i = list_all.dict_exts.begin();
diff -rubw aspell-0.50.4.1/common/info.hpp aspell-win32/common/info.hpp
--- aspell-0.50.4.1/common/info.hpp	2002-07-24 00:32:54.000000000 -0400
+++ aspell-win32/common/info.hpp	2004-01-06 15:29:43.000000000 -0500
@@ -7,6 +7,9 @@
 #ifndef ASPELL_INFO__HPP
 #define ASPELL_INFO__HPP
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "posib_err.hpp"
 #include "type_id.hpp"
 
@@ -25,7 +28,7 @@
   struct StringListImpl;
   class FStream;
 
-  struct ModuleInfo {
+  struct ASPELL_API ModuleInfo {
     const char * name;
     double order_num;
     const char * lib_dir;
@@ -36,7 +39,7 @@
   PosibErr<void> get_dict_file_name(const DictInfo *, 
 				    String & main_wl, String & flags);
   
-  struct DictInfo {
+  struct ASPELL_API DictInfo {
     const char * name;
     const char * code;
     const char * jargon;
@@ -49,7 +52,7 @@
   
   struct ModuleInfoNode;
   
-  class ModuleInfoList {
+  class ASPELL_API ModuleInfoList {
   public:
     ModuleInfoList() : size_(0), head_(0) {}
     void clear();
@@ -73,7 +76,7 @@
 
   struct DictInfoNode;
 
-  class DictInfoList {
+  class ASPELL_API DictInfoList {
   public:
     DictInfoList() : size_(0), head_(0) {}
     void clear();
@@ -92,9 +95,9 @@
     DictInfoNode * head_;
   };
 
-  DictInfoList * get_dict_info_list(Config *);
+  ASPELL_API DictInfoList * get_dict_info_list(Config *);
 
-  class ModuleInfoEnumeration {
+  class ASPELL_API ModuleInfoEnumeration {
   public:
     typedef const ModuleInfo * Value;
 
@@ -116,7 +119,7 @@
 
   struct DictInfoNode;
 
-  class DictInfoEnumeration {
+  class ASPELL_API DictInfoEnumeration {
   public:
     const DictInfoNode * node_;
     DictInfoEnumeration(const DictInfoNode * n) : node_(n) {}
diff -rubw aspell-0.50.4.1/common/iostream.cpp aspell-win32/common/iostream.cpp
--- aspell-0.50.4.1/common/iostream.cpp	2002-09-18 09:38:08.000000000 -0400
+++ aspell-win32/common/iostream.cpp	2004-01-06 15:29:45.000000000 -0500
@@ -5,9 +5,13 @@
 // it at http://www.gnu.org/.
 
 #include "iostream.hpp"
+#ifdef WIN32PORT
+#include "settings.h"
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
-  FStream CIN(stdin, false);
-  FStream COUT(stdout, false);
-  FStream CERR(stderr, false);
+  FStream DLLIMPORT CIN(stdin, false);
+  FStream DLLIMPORT COUT(stdout, false);
+  FStream DLLIMPORT CERR(stderr, false);
 }
diff -rubw aspell-0.50.4.1/common/iostream.hpp aspell-win32/common/iostream.hpp
--- aspell-0.50.4.1/common/iostream.hpp	2002-11-25 19:21:50.000000000 -0500
+++ aspell-win32/common/iostream.hpp	2004-01-06 15:29:47.000000000 -0500
@@ -9,11 +9,15 @@
 
 #include "fstream.hpp"
 
+#ifdef WIN32PORT
+#define DLLIMPORT ASPELL_API
+#else
 #if defined(__CYGWIN__)
 #define DLLIMPORT __declspec(dllimport)
 #else
 #define DLLIMPORT
 #endif
+#endif
 
 namespace acommon {
 
diff -rubw aspell-0.50.4.1/common/istream.hpp aspell-win32/common/istream.hpp
--- aspell-0.50.4.1/common/istream.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/istream.hpp	2004-01-06 15:29:48.000000000 -0500
@@ -8,12 +8,15 @@
 #define ASPELL_ISTREAM__HPP
 
 #include <string.h>
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
   class String;
 
-  class IStream {
+  class ASPELL_API IStream {
   private:
     char delem;
   public:
diff -rubw aspell-0.50.4.1/common/ostream.hpp aspell-win32/common/ostream.hpp
--- aspell-0.50.4.1/common/ostream.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/ostream.hpp	2004-01-06 15:29:50.000000000 -0500
@@ -8,10 +8,13 @@
 #define ASPELL_OSTREAM__HPP
 
 #include "parm_string.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
-  class OStream {
+  class ASPELL_API OStream {
   public:
     virtual void write (char c) = 0;
     virtual void write (ParmString) = 0;
diff -rubw aspell-0.50.4.1/common/parm_string.hpp aspell-win32/common/parm_string.hpp
--- aspell-0.50.4.1/common/parm_string.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/parm_string.hpp	2004-01-06 15:29:53.000000000 -0500
@@ -9,6 +9,9 @@
 
 #include <string.h>
 #include <limits.h>
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 //
 // ParmString is a special string class that is designed to be used as
@@ -37,7 +40,7 @@
 
   class String;
 
-  class ParmString {
+  class ASPELL_API ParmString {
   public:
     ParmString() : str_(0) {}
     ParmString(const char * str, unsigned int sz = UINT_MAX) 
diff -rubw aspell-0.50.4.1/common/posib_err.cpp aspell-win32/common/posib_err.cpp
--- aspell-0.50.4.1/common/posib_err.cpp	2002-11-29 02:14:36.000000000 -0500
+++ aspell-win32/common/posib_err.cpp	2004-01-06 15:29:57.000000000 -0500
@@ -9,12 +9,19 @@
 #include <assert.h>
 
 #include "posib_err.hpp"
+#ifdef WIN32PORT
+using namespace std; // FB
+#endif
 
 namespace acommon {
 
   String & String::operator= (const PosibErr<String> & s)
   {
+#ifdef WIN32PORT
+    string::operator=(s.data); //FB
+#else
     std::string::operator=(s.data);
+#endif
     return *this;
   }
 
diff -rubw aspell-0.50.4.1/common/posib_err.hpp aspell-win32/common/posib_err.hpp
--- aspell-0.50.4.1/common/posib_err.hpp	2003-01-22 22:27:16.000000000 -0500
+++ aspell-win32/common/posib_err.hpp	2004-01-06 15:30:07.000000000 -0500
@@ -9,6 +9,10 @@
 
 #include "string.hpp"
 #include "error.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+using namespace std; // FB
+#endif
 
 namespace acommon {
 
@@ -30,7 +34,7 @@
 
   template <typename Ret> class PosibErr;
   
-  class PosibErrBase {
+  class ASPELL_API PosibErrBase {
   private:
     struct ErrPtr {
       const Error * err;
@@ -202,12 +206,19 @@
   //
   //
 
+#ifdef WIN32PORT
+#else
   inline String::String(const PosibErr<String> & other)
     : std::string(other.data) {}
+#endif
 
   inline String & String::operator= (const PosibErr<const char *> & s)
   {
+#ifdef WIN32PORT
+    string::operator=(s.data); // FB
+#else
     std::string::operator=(s.data);
+#endif
     return *this;
   }
 
diff -rubw aspell-0.50.4.1/common/speller.hpp aspell-win32/common/speller.hpp
--- aspell-0.50.4.1/common/speller.hpp	2002-08-15 20:12:50.000000000 -0400
+++ aspell-win32/common/speller.hpp	2004-01-16 08:50:39.000000000 -0500
@@ -15,6 +15,9 @@
 #ifndef ASPELL_SPELLER__HPP
 #define ASPELL_SPELLER__HPP
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "can_have_error.hpp"
 #include "copy_ptr.hpp"
 #include "clone_ptr.hpp"
@@ -103,10 +106,10 @@
 
   // This function is current a hack to reload the filters in the
   // speller class.  I hope to eventually find a better way.
-  PosibErr<void> reload_filters(Speller * m);
+  ASPELL_API PosibErr<void> reload_filters(Speller * m);
 
 
-  PosibErr<Speller *> new_speller(Config * c);
+  ASPELL_API PosibErr<Speller *> new_speller(Config * c);
 
 }
 
diff -rubw aspell-0.50.4.1/common/stack_ptr.hpp aspell-win32/common/stack_ptr.hpp
--- aspell-0.50.4.1/common/stack_ptr.hpp	2002-08-11 09:58:30.000000000 -0400
+++ aspell-win32/common/stack_ptr.hpp	2004-01-06 15:30:11.000000000 -0500
@@ -21,9 +21,12 @@
     //   PosibErr<StackPtr<T > > pe = fun();
     // and operator* and StackPtr(T *) will be used.  The explicit
     // doesn't protect us here due to PosibErr
+#ifdef WIN32PORT
+#else
     StackPtr(const StackPtr & other);
     // becuase I am paranoid
     StackPtr & operator=(const StackPtr & other);
+#endif
 
   public:
 
diff -rubw aspell-0.50.4.1/common/string.hpp aspell-win32/common/string.hpp
--- aspell-0.50.4.1/common/string.hpp	2002-11-25 16:04:00.000000000 -0500
+++ aspell-win32/common/string.hpp	2004-01-06 15:30:15.000000000 -0500
@@ -14,6 +14,10 @@
 #include "parm_string.hpp"
 #include "istream.hpp"
 #include "ostream.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+using namespace std; // FB
+#endif
 
 namespace acommon {
 
@@ -22,6 +26,16 @@
   class String : public std::string, public OStream
   {
   public:
+#ifdef WIN32PORT
+    ASPELL_API String() : string() {}
+    ASPELL_API String(const char * s) : string(s) {}
+    ASPELL_API String(const char * s, unsigned int size) : string(s, size) {}
+    ASPELL_API String(ParmString s) : string(s) {}
+    ASPELL_API String(const std::string & s) : string(s) {}
+    ASPELL_API String(const String & other) : string(other) {}
+    ASPELL_API String & operator= (const char * s) {
+      string::operator= (s);
+#else
     String() : std::string() {}
     String(const char * s) : std::string(s) {}
     String(const char * s, unsigned int size) : std::string(s, size) {}
@@ -31,30 +45,43 @@
     inline String(const PosibErr<String> & other);
     String & operator= (const char * s) {
       std::string::operator= (s);
+#endif
       return *this;
     }
     inline String & operator= (const PosibErr<const char *> & s);
-    String & operator= (ParmString s) {
+    ASPELL_API String & operator= (ParmString s) {
+#ifdef WIN32PORT
+      string::operator= (s);
+#else
       std::string::operator= (s);
+#endif
       return *this;
     }
-    String & operator= (const std::string & s) {
+    ASPELL_API String & operator= (const std::string & s) {
+#ifdef WIN32PORT
+      string::operator= (s);
+#else
       std::string::operator= (s);
+#endif
       return *this;
     }
-    String & operator= (const String & other) {
+    ASPELL_API String & operator= (const String & other) {
+#ifdef WIN32PORT
+      string::operator= (other);
+#else
       std::string::operator= (other);
+#endif
       return *this;
     }
-    /*inline*/ String & operator= (const PosibErr<String> & s);
+    ASPELL_API /*inline*/ String & operator= (const PosibErr<String> & s);
 
     ~String() {}
 
-    void clear() {*this = "";}
+    void ASPELL_API clear() {*this = "";}
 
-    void write (char c);
-    void write (ParmString);
-    void write (const char *, unsigned int);
+    void ASPELL_API write (char c);
+    void ASPELL_API write (ParmString);
+    void ASPELL_API write (const char *, unsigned int);
   };
 
   inline String operator+ (ParmString rhs, ParmString lhs)
diff -rubw aspell-0.50.4.1/common/string_buffer.cpp aspell-win32/common/string_buffer.cpp
--- aspell-0.50.4.1/common/string_buffer.cpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/string_buffer.cpp	2004-01-06 15:30:17.000000000 -0500
@@ -17,7 +17,11 @@
   }
 
   char * StringBuffer::alloc(unsigned int size) {
+#if WIN32PORT
+    if (fill + size > get_buf_size()) {
+#else
     if (fill + size > buf_size) {
+#endif
       fill = 1;
       bufs.push_front(sbuf);
     }
diff -rubw aspell-0.50.4.1/common/string_buffer.hpp aspell-win32/common/string_buffer.hpp
--- aspell-0.50.4.1/common/string_buffer.hpp	2001-11-29 22:55:46.000000000 -0500
+++ aspell-win32/common/string_buffer.hpp	2004-01-06 15:30:19.000000000 -0500
@@ -10,10 +10,20 @@
 
   class StringBuffer {
   public: // but dont use
+#ifdef WIN32PORT
+#else
     static const unsigned int   buf_size = 1024 - 16;
+#endif
     struct Buf {
+#ifdef WIN32PORT
+      char buf[1024 - 16]; // FB
+#else
       char buf[buf_size];
+#endif
     };
+#ifdef WIN32PORT
+    unsigned int get_buf_size(){ return 1024 - 16; } //FB
+#endif
   private:
     static const Buf sbuf;
     BasicList<Buf> bufs;
diff -rubw aspell-0.50.4.1/common/string_list.hpp aspell-win32/common/string_list.hpp
--- aspell-0.50.4.1/common/string_list.hpp	2002-08-12 20:10:18.000000000 -0400
+++ aspell-win32/common/string_list.hpp	2004-01-02 12:42:18.000000000 -0500
@@ -55,18 +55,18 @@
     void destroy();
   public:
     friend bool operator==(const StringList &, const StringList &);
-    StringList() : first(0) {}
-    StringList(const StringList & other) 
+    ASPELL_API StringList() : first(0) {}
+    ASPELL_API StringList(const StringList & other) 
     {
       copy(other);
     }
-    StringList & operator= (const StringList & other)
+    ASPELL_API StringList & operator= (const StringList & other)
     {
       destroy();
       copy(other);
       return *this;
     }
-    virtual ~StringList() 
+    ASPELL_API virtual ~StringList() 
     {
       destroy();
     }
diff -rubw aspell-0.50.4.1/common/string_map.hpp aspell-win32/common/string_map.hpp
--- aspell-0.50.4.1/common/string_map.hpp	2002-08-12 20:10:18.000000000 -0400
+++ aspell-win32/common/string_map.hpp	2004-01-06 15:30:21.000000000 -0500
@@ -7,6 +7,9 @@
 #ifndef ASPELL_STRING_MAP__HPP
 #define ASPELL_STRING_MAP__HPP
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "mutable_container.hpp"
 #include "parm_string.hpp"
 #include "posib_err.hpp"
@@ -49,7 +52,7 @@
   
   // insert a new element.   Will NOT overright an existing entry.
   // returns false if the element already exists.
-  bool insert(ParmString key, ParmString value) {
+  bool ASPELL_API insert(ParmString key, ParmString value) {
     return insert(key, value, false);
   }
   PosibErr<bool> add(ParmString key) {
@@ -69,7 +72,7 @@
   // looks up an element.  Returns null if the element did not exist.
   // returns an empty string if the element exists but has a null value
   // otherwise returns the value
-  const char * lookup(ParmString key) const;
+  ASPELL_API const char * lookup(ParmString key) const;
   
   bool have(ParmString key) const {return lookup(key) != 0;}
   
@@ -81,7 +84,7 @@
   
   // inserts an element the last paramerts conters if an
   // existing element will be overwritten.
-  bool insert(ParmString key, ParmString value, bool);
+  bool ASPELL_API insert(ParmString key, ParmString value, bool);
   
   // clears the hash table, does NOT delete the old one
   void clear_table(const unsigned int * size);
@@ -97,7 +100,7 @@
   const unsigned int * buckets;
 };
 
-StringMap * new_string_map();
+ASPELL_API StringMap * new_string_map();
 
 
 }
diff -rubw aspell-0.50.4.1/common/tokenizer.hpp aspell-win32/common/tokenizer.hpp
--- aspell-0.50.4.1/common/tokenizer.hpp	2002-08-10 12:17:08.000000000 -0400
+++ aspell-win32/common/tokenizer.hpp	2004-01-06 15:30:23.000000000 -0500
@@ -9,6 +9,9 @@
 
 #include "char_vector.hpp"
 #include "filter_char.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
@@ -35,7 +38,11 @@
     void reset (FilterChar * in, FilterChar * stop);
     bool at_end() const {return word_begin == word_end;}
     
+#ifdef WIN32PORT
+    virtual bool advance(){return false;}; // returns false if there is nothing left
+#else
     virtual bool advance() = 0; // returns false if there is nothing left
+#endif
 
     bool is_begin(unsigned char c) const
       {return char_type_[c].begin;}
diff -rubw aspell-0.50.4.1/common/type_id.hpp aspell-win32/common/type_id.hpp
--- aspell-0.50.4.1/common/type_id.hpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/common/type_id.hpp	2004-01-06 15:30:25.000000000 -0500
@@ -9,12 +9,15 @@
 #ifndef ASPELL_TYPE_ID__HPP
 #define ASPELL_TYPE_ID__HPP
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "parm_string.hpp"
 
 namespace acommon {
 
 
-union TypeId {
+union ASPELL_API TypeId {
   unsigned int num;
   char str[4];
   TypeId(ParmString str);
diff -rubw aspell-0.50.4.1/common/vector.hpp aspell-win32/common/vector.hpp
--- aspell-0.50.4.1/common/vector.hpp	2003-01-13 06:11:02.000000000 -0500
+++ aspell-win32/common/vector.hpp	2004-01-06 15:30:26.000000000 -0500
@@ -8,6 +8,9 @@
 #define ACOMMON_VECTOR__HPP
 
 #include <vector>
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon 
 {
Only in aspell-win32/data: split.kbd
diff -rubw aspell-0.50.4.1/interfaces/cc/aspell.h aspell-win32/interfaces/cc/aspell.h
--- aspell-0.50.4.1/interfaces/cc/aspell.h	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/interfaces/cc/aspell.h	2004-01-16 08:50:34.000000000 -0500
@@ -9,6 +9,15 @@
 #ifndef ASPELL_ASPELL__H
 #define ASPELL_ASPELL__H
 
+#ifdef WIN32PORT
+#ifdef ASPELL_EXPORTS
+#define ASPELL_API __declspec(dllexport)
+#else
+#define ASPELL_API __declspec(dllimport)
+#endif
+#else
+#define ASPELL_API
+#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -34,13 +43,13 @@
 typedef struct AspellMutableContainer AspellMutableContainer;
 
 
-int aspell_mutable_container_add(struct AspellMutableContainer * ths, const char * to_add);
+ASPELL_API int aspell_mutable_container_add(struct AspellMutableContainer * ths, const char * to_add);
 
-int aspell_mutable_container_remove(struct AspellMutableContainer * ths, const char * to_rem);
+ASPELL_API int aspell_mutable_container_remove(struct AspellMutableContainer * ths, const char * to_rem);
 
-void aspell_mutable_container_clear(struct AspellMutableContainer * ths);
+ASPELL_API void aspell_mutable_container_clear(struct AspellMutableContainer * ths);
 
-struct AspellMutableContainer * aspell_mutable_container_to_mutable_container(struct AspellMutableContainer * ths);
+ASPELL_API struct AspellMutableContainer * aspell_mutable_container_to_mutable_container(struct AspellMutableContainer * ths);
 
 
 
@@ -82,50 +91,50 @@
 typedef struct AspellKeyInfoEnumeration AspellKeyInfoEnumeration;
 
 
-int aspell_key_info_enumeration_at_end(const struct AspellKeyInfoEnumeration * ths);
+ASPELL_API int aspell_key_info_enumeration_at_end(const struct AspellKeyInfoEnumeration * ths);
 
-const struct AspellKeyInfo * aspell_key_info_enumeration_next(struct AspellKeyInfoEnumeration * ths);
+ASPELL_API const struct AspellKeyInfo * aspell_key_info_enumeration_next(struct AspellKeyInfoEnumeration * ths);
 
-void delete_aspell_key_info_enumeration(struct AspellKeyInfoEnumeration * ths);
+ASPELL_API void delete_aspell_key_info_enumeration(struct AspellKeyInfoEnumeration * ths);
 
-struct AspellKeyInfoEnumeration * aspell_key_info_enumeration_clone(const struct AspellKeyInfoEnumeration * ths);
+ASPELL_API struct AspellKeyInfoEnumeration * aspell_key_info_enumeration_clone(const struct AspellKeyInfoEnumeration * ths);
 
-void aspell_key_info_enumeration_assign(struct AspellKeyInfoEnumeration * ths, const struct AspellKeyInfoEnumeration * other);
+ASPELL_API void aspell_key_info_enumeration_assign(struct AspellKeyInfoEnumeration * ths, const struct AspellKeyInfoEnumeration * other);
 
 
 
 typedef struct AspellConfig AspellConfig;
 
 
-struct AspellConfig * new_aspell_config();
+ASPELL_API struct AspellConfig * new_aspell_config();
 
-void delete_aspell_config(struct AspellConfig * ths);
+ASPELL_API void delete_aspell_config(struct AspellConfig * ths);
 
-struct AspellConfig * aspell_config_clone(const struct AspellConfig * ths);
+ASPELL_API struct AspellConfig * aspell_config_clone(const struct AspellConfig * ths);
 
-void aspell_config_assign(struct AspellConfig * ths, const struct AspellConfig * other);
+ASPELL_API void aspell_config_assign(struct AspellConfig * ths, const struct AspellConfig * other);
 
-unsigned int aspell_config_error_number(const struct AspellConfig * ths);
+ASPELL_API unsigned int aspell_config_error_number(const struct AspellConfig * ths);
 
-const char * aspell_config_error_message(const struct AspellConfig * ths);
+ASPELL_API const char * aspell_config_error_message(const struct AspellConfig * ths);
 
-const struct AspellError * aspell_config_error(const struct AspellConfig * ths);
+ASPELL_API const struct AspellError * aspell_config_error(const struct AspellConfig * ths);
 
 /* sets extra keys which this config class should accept
  * begin and end are expected to point to the begging
  * and end of an array of Aspell Key Info */
-void aspell_config_set_extra(struct AspellConfig * ths, const struct AspellKeyInfo * begin, const struct AspellKeyInfo * end);
+ASPELL_API void aspell_config_set_extra(struct AspellConfig * ths, const struct AspellKeyInfo * begin, const struct AspellKeyInfo * end);
 
 /* returns the KeyInfo object for the
  * corresponding key or returns null and sets
  * error_num to PERROR_UNKNOWN_KEY if the key is
  * not valid. The pointer returned is valid for
  * the lifetime of the object. */
-const struct AspellKeyInfo * aspell_config_keyinfo(struct AspellConfig * ths, const char * key);
+ASPELL_API const struct AspellKeyInfo * aspell_config_keyinfo(struct AspellConfig * ths, const char * key);
 
 /* returns a newly allocated enumeration of all the
  * possible objects this config class uses */
-struct AspellKeyInfoEnumeration * aspell_config_possible_elements(struct AspellConfig * ths, int include_extra);
+ASPELL_API struct AspellKeyInfoEnumeration * aspell_config_possible_elements(struct AspellConfig * ths, int include_extra);
 
 /* returns the default value for given key which
  * way involve substating variables, thus it is
@@ -133,12 +142,12 @@
  * and sets error_num to PERROR_UNKNOWN_KEY if
  * the key is not valid. Uses the temporary
  * string. */
-const char * aspell_config_get_default(struct AspellConfig * ths, const char * key);
+ASPELL_API const char * aspell_config_get_default(struct AspellConfig * ths, const char * key);
 
 /* returns a newly alloacted enumeration of all the
  * key/value pairs. This DOES not include ones
  * which are set to their default values */
-struct AspellStringPairEnumeration * aspell_config_elements(struct AspellConfig * ths);
+ASPELL_API struct AspellStringPairEnumeration * aspell_config_elements(struct AspellConfig * ths);
 
 /* inserts an item, if the item already exists it
  * will be replaced. returns true if it succesed
@@ -150,7 +159,7 @@
  * PERROR_CANT_CHANGE_VALUE, and if the value is
  * a list and you are trying to set it directory
  * it sets error_num to PERROR_LIST_SET */
-int aspell_config_replace(struct AspellConfig * ths, const char * key, const char * value);
+ASPELL_API int aspell_config_replace(struct AspellConfig * ths, const char * key, const char * value);
 
 /* remove a key and returns true if it exists
  * otherise return false. This effictly sets the
@@ -162,20 +171,20 @@
  * PERROR_UNKNOWN_KEY, if the value can not be
  * changed sets error_num to
  * PERROR_CANT_CHANGE_VALUE */
-int aspell_config_remove(struct AspellConfig * ths, const char * key);
+ASPELL_API int aspell_config_remove(struct AspellConfig * ths, const char * key);
 
-int aspell_config_have(const struct AspellConfig * ths, const char * key);
+ASPELL_API int aspell_config_have(const struct AspellConfig * ths, const char * key);
 
 /* returns null on error */
-const char * aspell_config_retrieve(struct AspellConfig * ths, const char * key);
+ASPELL_API const char * aspell_config_retrieve(struct AspellConfig * ths, const char * key);
 
-int aspell_config_retrieve_list(struct AspellConfig * ths, const char * key, struct AspellMutableContainer * lst);
+ASPELL_API int aspell_config_retrieve_list(struct AspellConfig * ths, const char * key, struct AspellMutableContainer * lst);
 
 /* return -1 on error, 0 if false, 1 if true */
-int aspell_config_retrieve_bool(struct AspellConfig * ths, const char * key);
+ASPELL_API int aspell_config_retrieve_bool(struct AspellConfig * ths, const char * key);
 
 /* return -1 on error */
-int aspell_config_retrieve_int(struct AspellConfig * ths, const char * key);
+ASPELL_API int aspell_config_retrieve_int(struct AspellConfig * ths, const char * key);
 
 
 
@@ -193,7 +202,7 @@
 
 typedef struct AspellError AspellError;
 
-int aspell_error_is_a(const struct AspellError * ths, const struct AspellErrorInfo * e);
+ASPELL_API int aspell_error_is_a(const struct AspellError * ths, const struct AspellErrorInfo * e);
 
 
 struct AspellErrorInfo {
@@ -218,13 +227,13 @@
 typedef struct AspellCanHaveError AspellCanHaveError;
 
 
-unsigned int aspell_error_number(const struct AspellCanHaveError * ths);
+ASPELL_API unsigned int aspell_error_number(const struct AspellCanHaveError * ths);
 
-const char * aspell_error_message(const struct AspellCanHaveError * ths);
+ASPELL_API const char * aspell_error_message(const struct AspellCanHaveError * ths);
 
-const struct AspellError * aspell_error(const struct AspellCanHaveError * ths);
+ASPELL_API const struct AspellError * aspell_error(const struct AspellCanHaveError * ths);
 
-void delete_aspell_can_have_error(struct AspellCanHaveError * ths);
+ASPELL_API void delete_aspell_can_have_error(struct AspellCanHaveError * ths);
 
 
 
@@ -274,44 +283,44 @@
 typedef struct AspellSpeller AspellSpeller;
 
 
-struct AspellCanHaveError * new_aspell_speller(struct AspellConfig * config);
+ASPELL_API struct AspellCanHaveError * new_aspell_speller(struct AspellConfig * config);
 
-struct AspellSpeller * to_aspell_speller(struct AspellCanHaveError * obj);
+ASPELL_API struct AspellSpeller * to_aspell_speller(struct AspellCanHaveError * obj);
 
-void delete_aspell_speller(struct AspellSpeller * ths);
+ASPELL_API void delete_aspell_speller(struct AspellSpeller * ths);
 
-unsigned int aspell_speller_error_number(const struct AspellSpeller * ths);
+ASPELL_API unsigned int aspell_speller_error_number(const struct AspellSpeller * ths);
 
-const char * aspell_speller_error_message(const struct AspellSpeller * ths);
+ASPELL_API const char * aspell_speller_error_message(const struct AspellSpeller * ths);
 
-const struct AspellError * aspell_speller_error(const struct AspellSpeller * ths);
+ASPELL_API const struct AspellError * aspell_speller_error(const struct AspellSpeller * ths);
 
-struct AspellConfig * aspell_speller_config(struct AspellSpeller * ths);
+ASPELL_API struct AspellConfig * aspell_speller_config(struct AspellSpeller * ths);
 
 /* returns  0 if it is not in the dictionary,
  * 1 if it is, or -1 on error. */
-int aspell_speller_check(struct AspellSpeller * ths, const char * word, int word_size);
+ASPELL_API int aspell_speller_check(struct AspellSpeller * ths, const char * word, int word_size);
 
-int aspell_speller_add_to_personal(struct AspellSpeller * ths, const char * word, int word_size);
+ASPELL_API int aspell_speller_add_to_personal(struct AspellSpeller * ths, const char * word, int word_size);
 
-int aspell_speller_add_to_session(struct AspellSpeller * ths, const char * word, int word_size);
+ASPELL_API int aspell_speller_add_to_session(struct AspellSpeller * ths, const char * word, int word_size);
 
-const struct AspellWordList * aspell_speller_personal_word_list(struct AspellSpeller * ths);
+ASPELL_API const struct AspellWordList * aspell_speller_personal_word_list(struct AspellSpeller * ths);
 
-const struct AspellWordList * aspell_speller_session_word_list(struct AspellSpeller * ths);
+ASPELL_API const struct AspellWordList * aspell_speller_session_word_list(struct AspellSpeller * ths);
 
-const struct AspellWordList * aspell_speller_main_word_list(struct AspellSpeller * ths);
+ASPELL_API const struct AspellWordList * aspell_speller_main_word_list(struct AspellSpeller * ths);
 
-int aspell_speller_save_all_word_lists(struct AspellSpeller * ths);
+ASPELL_API int aspell_speller_save_all_word_lists(struct AspellSpeller * ths);
 
-int aspell_speller_clear_session(struct AspellSpeller * ths);
+ASPELL_API int aspell_speller_clear_session(struct AspellSpeller * ths);
 
 /* Return null on error.
  * the word list returned by suggest is only valid until the next
  * call to suggest */
-const struct AspellWordList * aspell_speller_suggest(struct AspellSpeller * ths, const char * word, int word_size);
+ASPELL_API const struct AspellWordList * aspell_speller_suggest(struct AspellSpeller * ths, const char * word, int word_size);
 
-int aspell_speller_store_replacement(struct AspellSpeller * ths, const char * mis, int mis_size, const char * cor, int cor_size);
+ASPELL_API int aspell_speller_store_replacement(struct AspellSpeller * ths, const char * mis, int mis_size, const char * cor, int cor_size);
 
 
 
@@ -321,15 +330,15 @@
 typedef struct AspellFilter AspellFilter;
 
 
-void delete_aspell_filter(struct AspellFilter * ths);
+ASPELL_API void delete_aspell_filter(struct AspellFilter * ths);
 
-unsigned int aspell_filter_error_number(const struct AspellFilter * ths);
+ASPELL_API unsigned int aspell_filter_error_number(const struct AspellFilter * ths);
 
-const char * aspell_filter_error_message(const struct AspellFilter * ths);
+ASPELL_API const char * aspell_filter_error_message(const struct AspellFilter * ths);
 
-const struct AspellError * aspell_filter_error(const struct AspellFilter * ths);
+ASPELL_API const struct AspellError * aspell_filter_error(const struct AspellFilter * ths);
 
-struct AspellFilter * to_aspell_filter(struct AspellCanHaveError * obj);
+ASPELL_API struct AspellFilter * to_aspell_filter(struct AspellCanHaveError * obj);
 
 
 
@@ -351,13 +360,13 @@
 typedef struct AspellDocumentChecker AspellDocumentChecker;
 
 
-void delete_aspell_document_checker(struct AspellDocumentChecker * ths);
+ASPELL_API void delete_aspell_document_checker(struct AspellDocumentChecker * ths);
 
-unsigned int aspell_document_checker_error_number(const struct AspellDocumentChecker * ths);
+ASPELL_API unsigned int aspell_document_checker_error_number(const struct AspellDocumentChecker * ths);
 
-const char * aspell_document_checker_error_message(const struct AspellDocumentChecker * ths);
+ASPELL_API const char * aspell_document_checker_error_message(const struct AspellDocumentChecker * ths);
 
-const struct AspellError * aspell_document_checker_error(const struct AspellDocumentChecker * ths);
+ASPELL_API const struct AspellError * aspell_document_checker_error(const struct AspellDocumentChecker * ths);
 
 /* Creates a new document checker.
  * The speller class is expect to last until this
@@ -368,13 +377,13 @@
  * If filter is given then it will take ownership of
  * the filter class and use it to do the filtering.
  * You are expected to free the checker when done. */
-struct AspellCanHaveError * new_aspell_document_checker(struct AspellSpeller * speller);
+ASPELL_API struct AspellCanHaveError * new_aspell_document_checker(struct AspellSpeller * speller);
 
-struct AspellDocumentChecker * to_aspell_document_checker(struct AspellCanHaveError * obj);
+ASPELL_API struct AspellDocumentChecker * to_aspell_document_checker(struct AspellCanHaveError * obj);
 
 /* reset the internal state of the filter.
  * should be called whenever a new document is being filtered */
-void aspell_document_checker_reset(struct AspellDocumentChecker * ths);
+ASPELL_API void aspell_document_checker_reset(struct AspellDocumentChecker * ths);
 
 /* process a string
  * The string passed in should only be split on white space
@@ -383,15 +392,15 @@
  * in the document.  Passing in stings out of order, skipping
  * strings or passing them in more than once may lead to undefined
  * results. */
-void aspell_document_checker_process(struct AspellDocumentChecker * ths, const char * str, int size);
+ASPELL_API void aspell_document_checker_process(struct AspellDocumentChecker * ths, const char * str, int size);
 
 /* returns the next misspelled word in the processed string
  * if there are no more misspelled word than token.word
  * will be null and token.size will be 0 */
-struct AspellToken aspell_document_checker_next_misspelling(struct AspellDocumentChecker * ths);
+ASPELL_API struct AspellToken aspell_document_checker_next_misspelling(struct AspellDocumentChecker * ths);
 
 /* returns the underlying filter class */
-struct AspellFilter * aspell_document_checker_filter(struct AspellDocumentChecker * ths);
+ASPELL_API struct AspellFilter * aspell_document_checker_filter(struct AspellDocumentChecker * ths);
 
 
 
@@ -401,11 +410,11 @@
 typedef struct AspellWordList AspellWordList;
 
 
-int aspell_word_list_empty(const struct AspellWordList * ths);
+ASPELL_API int aspell_word_list_empty(const struct AspellWordList * ths);
 
-unsigned int aspell_word_list_size(const struct AspellWordList * ths);
+ASPELL_API unsigned int aspell_word_list_size(const struct AspellWordList * ths);
 
-struct AspellStringEnumeration * aspell_word_list_elements(const struct AspellWordList * ths);
+ASPELL_API struct AspellStringEnumeration * aspell_word_list_elements(const struct AspellWordList * ths);
 
 
 
@@ -415,15 +424,15 @@
 typedef struct AspellStringEnumeration AspellStringEnumeration;
 
 
-void delete_aspell_string_enumeration(struct AspellStringEnumeration * ths);
+ASPELL_API void delete_aspell_string_enumeration(struct AspellStringEnumeration * ths);
 
-struct AspellStringEnumeration * aspell_string_enumeration_clone(const struct AspellStringEnumeration * ths);
+ASPELL_API struct AspellStringEnumeration * aspell_string_enumeration_clone(const struct AspellStringEnumeration * ths);
 
-void aspell_string_enumeration_assign(struct AspellStringEnumeration * ths, const struct AspellStringEnumeration * other);
+ASPELL_API void aspell_string_enumeration_assign(struct AspellStringEnumeration * ths, const struct AspellStringEnumeration * other);
 
-int aspell_string_enumeration_at_end(const struct AspellStringEnumeration * ths);
+ASPELL_API int aspell_string_enumeration_at_end(const struct AspellStringEnumeration * ths);
 
-const char * aspell_string_enumeration_next(struct AspellStringEnumeration * ths);
+ASPELL_API const char * aspell_string_enumeration_next(struct AspellStringEnumeration * ths);
 
 
 
@@ -472,56 +481,56 @@
 typedef struct AspellModuleInfoList AspellModuleInfoList;
 
 
-struct AspellModuleInfoList * get_aspell_module_info_list(struct AspellConfig * config);
+ASPELL_API struct AspellModuleInfoList * get_aspell_module_info_list(struct AspellConfig * config);
 
-int aspell_module_info_list_empty(const struct AspellModuleInfoList * ths);
+ASPELL_API int aspell_module_info_list_empty(const struct AspellModuleInfoList * ths);
 
-unsigned int aspell_module_info_list_size(const struct AspellModuleInfoList * ths);
+ASPELL_API unsigned int aspell_module_info_list_size(const struct AspellModuleInfoList * ths);
 
-struct AspellModuleInfoEnumeration * aspell_module_info_list_elements(const struct AspellModuleInfoList * ths);
+ASPELL_API struct AspellModuleInfoEnumeration * aspell_module_info_list_elements(const struct AspellModuleInfoList * ths);
 
 
 
 typedef struct AspellDictInfoList AspellDictInfoList;
 
 
-struct AspellDictInfoList * get_aspell_dict_info_list(struct AspellConfig * config);
+ASPELL_API struct AspellDictInfoList * get_aspell_dict_info_list(struct AspellConfig * config);
 
-int aspell_dict_info_list_empty(const struct AspellDictInfoList * ths);
+ASPELL_API int aspell_dict_info_list_empty(const struct AspellDictInfoList * ths);
 
-unsigned int aspell_dict_info_list_size(const struct AspellDictInfoList * ths);
+ASPELL_API unsigned int aspell_dict_info_list_size(const struct AspellDictInfoList * ths);
 
-struct AspellDictInfoEnumeration * aspell_dict_info_list_elements(const struct AspellDictInfoList * ths);
+ASPELL_API struct AspellDictInfoEnumeration * aspell_dict_info_list_elements(const struct AspellDictInfoList * ths);
 
 
 
 typedef struct AspellModuleInfoEnumeration AspellModuleInfoEnumeration;
 
 
-int aspell_module_info_enumeration_at_end(const struct AspellModuleInfoEnumeration * ths);
+ASPELL_API int aspell_module_info_enumeration_at_end(const struct AspellModuleInfoEnumeration * ths);
 
-const struct AspellModuleInfo * aspell_module_info_enumeration_next(struct AspellModuleInfoEnumeration * ths);
+ASPELL_API const struct AspellModuleInfo * aspell_module_info_enumeration_next(struct AspellModuleInfoEnumeration * ths);
 
-void delete_aspell_module_info_enumeration(struct AspellModuleInfoEnumeration * ths);
+ASPELL_API void delete_aspell_module_info_enumeration(struct AspellModuleInfoEnumeration * ths);
 
-struct AspellModuleInfoEnumeration * aspell_module_info_enumeration_clone(const struct AspellModuleInfoEnumeration * ths);
+ASPELL_API struct AspellModuleInfoEnumeration * aspell_module_info_enumeration_clone(const struct AspellModuleInfoEnumeration * ths);
 
-void aspell_module_info_enumeration_assign(struct AspellModuleInfoEnumeration * ths, const struct AspellModuleInfoEnumeration * other);
+ASPELL_API void aspell_module_info_enumeration_assign(struct AspellModuleInfoEnumeration * ths, const struct AspellModuleInfoEnumeration * other);
 
 
 
 typedef struct AspellDictInfoEnumeration AspellDictInfoEnumeration;
 
 
-int aspell_dict_info_enumeration_at_end(const struct AspellDictInfoEnumeration * ths);
+ASPELL_API int aspell_dict_info_enumeration_at_end(const struct AspellDictInfoEnumeration * ths);
 
-const struct AspellDictInfo * aspell_dict_info_enumeration_next(struct AspellDictInfoEnumeration * ths);
+ASPELL_API const struct AspellDictInfo * aspell_dict_info_enumeration_next(struct AspellDictInfoEnumeration * ths);
 
-void delete_aspell_dict_info_enumeration(struct AspellDictInfoEnumeration * ths);
+ASPELL_API void delete_aspell_dict_info_enumeration(struct AspellDictInfoEnumeration * ths);
 
-struct AspellDictInfoEnumeration * aspell_dict_info_enumeration_clone(const struct AspellDictInfoEnumeration * ths);
+ASPELL_API struct AspellDictInfoEnumeration * aspell_dict_info_enumeration_clone(const struct AspellDictInfoEnumeration * ths);
 
-void aspell_dict_info_enumeration_assign(struct AspellDictInfoEnumeration * ths, const struct AspellDictInfoEnumeration * other);
+ASPELL_API void aspell_dict_info_enumeration_assign(struct AspellDictInfoEnumeration * ths, const struct AspellDictInfoEnumeration * other);
 
 
 
@@ -531,27 +540,27 @@
 typedef struct AspellStringList AspellStringList;
 
 
-struct AspellStringList * new_aspell_string_list();
+ASPELL_API struct AspellStringList * new_aspell_string_list();
 
-int aspell_string_list_empty(const struct AspellStringList * ths);
+ASPELL_API int aspell_string_list_empty(const struct AspellStringList * ths);
 
-unsigned int aspell_string_list_size(const struct AspellStringList * ths);
+ASPELL_API unsigned int aspell_string_list_size(const struct AspellStringList * ths);
 
-struct AspellStringEnumeration * aspell_string_list_elements(const struct AspellStringList * ths);
+ASPELL_API struct AspellStringEnumeration * aspell_string_list_elements(const struct AspellStringList * ths);
 
-int aspell_string_list_add(struct AspellStringList * ths, const char * to_add);
+ASPELL_API int aspell_string_list_add(struct AspellStringList * ths, const char * to_add);
 
-int aspell_string_list_remove(struct AspellStringList * ths, const char * to_rem);
+ASPELL_API int aspell_string_list_remove(struct AspellStringList * ths, const char * to_rem);
 
-void aspell_string_list_clear(struct AspellStringList * ths);
+ASPELL_API void aspell_string_list_clear(struct AspellStringList * ths);
 
-struct AspellMutableContainer * aspell_string_list_to_mutable_container(struct AspellStringList * ths);
+ASPELL_API struct AspellMutableContainer * aspell_string_list_to_mutable_container(struct AspellStringList * ths);
 
-void delete_aspell_string_list(struct AspellStringList * ths);
+ASPELL_API void delete_aspell_string_list(struct AspellStringList * ths);
 
-struct AspellStringList * aspell_string_list_clone(const struct AspellStringList * ths);
+ASPELL_API struct AspellStringList * aspell_string_list_clone(const struct AspellStringList * ths);
 
-void aspell_string_list_assign(struct AspellStringList * ths, const struct AspellStringList * other);
+ASPELL_API void aspell_string_list_assign(struct AspellStringList * ths, const struct AspellStringList * other);
 
 
 
@@ -561,43 +570,43 @@
 typedef struct AspellStringMap AspellStringMap;
 
 
-struct AspellStringMap * new_aspell_string_map();
+ASPELL_API struct AspellStringMap * new_aspell_string_map();
 
-int aspell_string_map_add(struct AspellStringMap * ths, const char * to_add);
+ASPELL_API int aspell_string_map_add(struct AspellStringMap * ths, const char * to_add);
 
-int aspell_string_map_remove(struct AspellStringMap * ths, const char * to_rem);
+ASPELL_API int aspell_string_map_remove(struct AspellStringMap * ths, const char * to_rem);
 
-void aspell_string_map_clear(struct AspellStringMap * ths);
+ASPELL_API void aspell_string_map_clear(struct AspellStringMap * ths);
 
-struct AspellMutableContainer * aspell_string_map_to_mutable_container(struct AspellStringMap * ths);
+ASPELL_API struct AspellMutableContainer * aspell_string_map_to_mutable_container(struct AspellStringMap * ths);
 
-void delete_aspell_string_map(struct AspellStringMap * ths);
+ASPELL_API void delete_aspell_string_map(struct AspellStringMap * ths);
 
-struct AspellStringMap * aspell_string_map_clone(const struct AspellStringMap * ths);
+ASPELL_API struct AspellStringMap * aspell_string_map_clone(const struct AspellStringMap * ths);
 
-void aspell_string_map_assign(struct AspellStringMap * ths, const struct AspellStringMap * other);
+ASPELL_API void aspell_string_map_assign(struct AspellStringMap * ths, const struct AspellStringMap * other);
 
-int aspell_string_map_empty(const struct AspellStringMap * ths);
+ASPELL_API int aspell_string_map_empty(const struct AspellStringMap * ths);
 
-unsigned int aspell_string_map_size(const struct AspellStringMap * ths);
+ASPELL_API unsigned int aspell_string_map_size(const struct AspellStringMap * ths);
 
-struct AspellStringPairEnumeration * aspell_string_map_elements(const struct AspellStringMap * ths);
+ASPELL_API struct AspellStringPairEnumeration * aspell_string_map_elements(const struct AspellStringMap * ths);
 
 /* Insert a new element.
  * Will NOT overright an existing entry.
  * Returns false if the element already exists. */
-int aspell_string_map_insert(struct AspellStringMap * ths, const char * key, const char * value);
+ASPELL_API int aspell_string_map_insert(struct AspellStringMap * ths, const char * key, const char * value);
 
 /* Insert a new element.
  * Will overright an existing entry.
  * Always returns true. */
-int aspell_string_map_replace(struct AspellStringMap * ths, const char * key, const char * value);
+ASPELL_API int aspell_string_map_replace(struct AspellStringMap * ths, const char * key, const char * value);
 
 /* Looks up an element.
  * Returns null if the element did not exist.
  * Returns an empty string if the element exists but has a null value.
  * Otherwises returns the value */
-const char * aspell_string_map_lookup(const struct AspellStringMap * ths, const char * key);
+ASPELL_API const char * aspell_string_map_lookup(const struct AspellStringMap * ths, const char * key);
 
 
 
@@ -622,15 +631,15 @@
 typedef struct AspellStringPairEnumeration AspellStringPairEnumeration;
 
 
-int aspell_string_pair_enumeration_at_end(const struct AspellStringPairEnumeration * ths);
+ASPELL_API int aspell_string_pair_enumeration_at_end(const struct AspellStringPairEnumeration * ths);
 
-struct AspellStringPair aspell_string_pair_enumeration_next(struct AspellStringPairEnumeration * ths);
+ASPELL_API struct AspellStringPair aspell_string_pair_enumeration_next(struct AspellStringPairEnumeration * ths);
 
-void delete_aspell_string_pair_enumeration(struct AspellStringPairEnumeration * ths);
+ASPELL_API void delete_aspell_string_pair_enumeration(struct AspellStringPairEnumeration * ths);
 
-struct AspellStringPairEnumeration * aspell_string_pair_enumeration_clone(const struct AspellStringPairEnumeration * ths);
+ASPELL_API struct AspellStringPairEnumeration * aspell_string_pair_enumeration_clone(const struct AspellStringPairEnumeration * ths);
 
-void aspell_string_pair_enumeration_assign(struct AspellStringPairEnumeration * ths, const struct AspellStringPairEnumeration * other);
+ASPELL_API void aspell_string_pair_enumeration_assign(struct AspellStringPairEnumeration * ths, const struct AspellStringPairEnumeration * other);
 
 
 
diff -rubw aspell-0.50.4.1/lib/can_have_error-c.cpp aspell-win32/lib/can_have_error-c.cpp
--- aspell-0.50.4.1/lib/can_have_error-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/can_have_error-c.cpp	2004-01-06 15:30:29.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "can_have_error.hpp"
 #include "error.hpp"
 
@@ -14,22 +17,22 @@
 class CanHaveError;
 struct Error;
 
-extern "C" unsigned int aspell_error_number(const CanHaveError * ths)
+extern "C" ASPELL_API unsigned int aspell_error_number(const CanHaveError * ths)
 {
   return ths->err_ == 0 ? 0 : 1;
 }
 
-extern "C" const char * aspell_error_message(const CanHaveError * ths)
+extern "C" ASPELL_API const char * aspell_error_message(const CanHaveError * ths)
 {
   return ths->err_ ? ths->err_->mesg : "";
 }
 
-extern "C" const Error * aspell_error(const CanHaveError * ths)
+extern "C" ASPELL_API const Error * aspell_error(const CanHaveError * ths)
 {
   return ths->err_;
 }
 
-extern "C" void delete_aspell_can_have_error(CanHaveError * ths)
+extern "C" ASPELL_API void delete_aspell_can_have_error(CanHaveError * ths)
 {
   delete ths;
 }
diff -rubw aspell-0.50.4.1/lib/config-c.cpp aspell-win32/lib/config-c.cpp
--- aspell-0.50.4.1/lib/config-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/config-c.cpp	2004-01-06 15:30:32.000000000 -0500
@@ -6,6 +6,10 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#include "settings.h"
+#endif
 #include "config.hpp"
 #include "error.hpp"
 #include "posib_err.hpp"
@@ -20,72 +24,72 @@
 class MutableContainer;
 class StringPairEnumeration;
 
-extern "C" int aspell_key_info_enumeration_at_end(const KeyInfoEnumeration * ths)
+extern "C" ASPELL_API int aspell_key_info_enumeration_at_end(const KeyInfoEnumeration * ths)
 {
   return ths->at_end();
 }
 
-extern "C" const KeyInfo * aspell_key_info_enumeration_next(KeyInfoEnumeration * ths)
+extern "C" ASPELL_API const KeyInfo * aspell_key_info_enumeration_next(KeyInfoEnumeration * ths)
 {
   return ths->next();
 }
 
-extern "C" void delete_aspell_key_info_enumeration(KeyInfoEnumeration * ths)
+extern "C" ASPELL_API void delete_aspell_key_info_enumeration(KeyInfoEnumeration * ths)
 {
   delete ths;
 }
 
-extern "C" KeyInfoEnumeration * aspell_key_info_enumeration_clone(const KeyInfoEnumeration * ths)
+extern "C" ASPELL_API KeyInfoEnumeration * aspell_key_info_enumeration_clone(const KeyInfoEnumeration * ths)
 {
   return ths->clone();
 }
 
-extern "C" void aspell_key_info_enumeration_assign(KeyInfoEnumeration * ths, const KeyInfoEnumeration * other)
+extern "C" ASPELL_API void aspell_key_info_enumeration_assign(KeyInfoEnumeration * ths, const KeyInfoEnumeration * other)
 {
   ths->assign(other);
 }
 
-extern "C" Config * new_aspell_config()
+extern "C" ASPELL_API Config * new_aspell_config()
 {
   return new_config();
 }
 
-extern "C" void delete_aspell_config(Config * ths)
+extern "C" ASPELL_API void delete_aspell_config(Config * ths)
 {
   delete ths;
 }
 
-extern "C" Config * aspell_config_clone(const Config * ths)
+extern "C" ASPELL_API Config * aspell_config_clone(const Config * ths)
 {
   return ths->clone();
 }
 
-extern "C" void aspell_config_assign(Config * ths, const Config * other)
+extern "C" ASPELL_API void aspell_config_assign(Config * ths, const Config * other)
 {
   ths->assign(other);
 }
 
-extern "C" unsigned int aspell_config_error_number(const Config * ths)
+extern "C" ASPELL_API unsigned int aspell_config_error_number(const Config * ths)
 {
   return ths->err_ == 0 ? 0 : 1;
 }
 
-extern "C" const char * aspell_config_error_message(const Config * ths)
+extern "C" ASPELL_API const char * aspell_config_error_message(const Config * ths)
 {
   return ths->err_ ? ths->err_->mesg : "";
 }
 
-extern "C" const Error * aspell_config_error(const Config * ths)
+extern "C" ASPELL_API const Error * aspell_config_error(const Config * ths)
 {
   return ths->err_;
 }
 
-extern "C" void aspell_config_set_extra(Config * ths, const KeyInfo * begin, const KeyInfo * end)
+extern "C" ASPELL_API void aspell_config_set_extra(Config * ths, const KeyInfo * begin, const KeyInfo * end)
 {
   ths->set_extra(begin, end);
 }
 
-extern "C" const KeyInfo * aspell_config_keyinfo(Config * ths, const char * key)
+extern "C" ASPELL_API const KeyInfo * aspell_config_keyinfo(Config * ths, const char * key)
 {
   PosibErr<const KeyInfo *> ret = ths->keyinfo(key);
   ths->err_.reset(ret.release_err());
@@ -93,12 +97,16 @@
   return ret.data;
 }
 
-extern "C" KeyInfoEnumeration * aspell_config_possible_elements(Config * ths, int include_extra)
+extern "C" ASPELL_API KeyInfoEnumeration * aspell_config_possible_elements(Config * ths, int include_extra)
 {
+#ifdef WIN32PORT
+  return ths->possible_elements(include_extra != 0);//FB
+#else
   return ths->possible_elements(include_extra);
+#endif
 }
 
-extern "C" const char * aspell_config_get_default(Config * ths, const char * key)
+extern "C" ASPELL_API const char * aspell_config_get_default(Config * ths, const char * key)
 {
   PosibErr<String> ret = ths->get_default(key);
   ths->err_.reset(ret.release_err());
@@ -107,12 +115,12 @@
   return ths->temp_str.c_str();
 }
 
-extern "C" StringPairEnumeration * aspell_config_elements(Config * ths)
+extern "C" ASPELL_API StringPairEnumeration * aspell_config_elements(Config * ths)
 {
   return ths->elements();
 }
 
-extern "C" int aspell_config_replace(Config * ths, const char * key, const char * value)
+extern "C" ASPELL_API int aspell_config_replace(Config * ths, const char * key, const char * value)
 {
   PosibErr<void> ret = ths->replace(key, value);
   ths->err_.reset(ret.release_err());
@@ -120,7 +128,7 @@
   return 1;
 }
 
-extern "C" int aspell_config_remove(Config * ths, const char * key)
+extern "C" ASPELL_API int aspell_config_remove(Config * ths, const char * key)
 {
   PosibErr<void> ret = ths->remove(key);
   ths->err_.reset(ret.release_err());
@@ -128,12 +136,12 @@
   return 1;
 }
 
-extern "C" int aspell_config_have(const Config * ths, const char * key)
+extern "C" ASPELL_API int aspell_config_have(const Config * ths, const char * key)
 {
   return ths->have(key);
 }
 
-extern "C" const char * aspell_config_retrieve(Config * ths, const char * key)
+extern "C" ASPELL_API const char * aspell_config_retrieve(Config * ths, const char * key)
 {
   PosibErr<String> ret = ths->retrieve(key);
   ths->err_.reset(ret.release_err());
@@ -142,7 +150,7 @@
   return ths->temp_str.c_str();
 }
 
-extern "C" int aspell_config_retrieve_list(Config * ths, const char * key, MutableContainer * lst)
+extern "C" ASPELL_API int aspell_config_retrieve_list(Config * ths, const char * key, MutableContainer * lst)
 {
   PosibErr<void> ret = ths->retrieve_list(key, lst);
   ths->err_.reset(ret.release_err());
@@ -150,7 +158,7 @@
   return 1;
 }
 
-extern "C" int aspell_config_retrieve_bool(Config * ths, const char * key)
+extern "C" ASPELL_API int aspell_config_retrieve_bool(Config * ths, const char * key)
 {
   PosibErr<bool> ret = ths->retrieve_bool(key);
   ths->err_.reset(ret.release_err());
@@ -158,7 +166,7 @@
   return ret.data;
 }
 
-extern "C" int aspell_config_retrieve_int(Config * ths, const char * key)
+extern "C" ASPELL_API int aspell_config_retrieve_int(Config * ths, const char * key)
 {
   PosibErr<unsigned int> ret = ths->retrieve_int(key);
   ths->err_.reset(ret.release_err());
diff -rubw aspell-0.50.4.1/lib/document_checker-c.cpp aspell-win32/lib/document_checker-c.cpp
--- aspell-0.50.4.1/lib/document_checker-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/document_checker-c.cpp	2004-01-06 15:30:35.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "document_checker.hpp"
 #include "error.hpp"
 
@@ -17,27 +20,27 @@
 class Filter;
 class Speller;
 
-extern "C" void delete_aspell_document_checker(DocumentChecker * ths)
+extern "C" ASPELL_API void delete_aspell_document_checker(DocumentChecker * ths)
 {
   delete ths;
 }
 
-extern "C" unsigned int aspell_document_checker_error_number(const DocumentChecker * ths)
+extern "C" ASPELL_API unsigned int aspell_document_checker_error_number(const DocumentChecker * ths)
 {
   return ths->err_ == 0 ? 0 : 1;
 }
 
-extern "C" const char * aspell_document_checker_error_message(const DocumentChecker * ths)
+extern "C" ASPELL_API const char * aspell_document_checker_error_message(const DocumentChecker * ths)
 {
   return ths->err_ ? ths->err_->mesg : "";
 }
 
-extern "C" const Error * aspell_document_checker_error(const DocumentChecker * ths)
+extern "C" ASPELL_API const Error * aspell_document_checker_error(const DocumentChecker * ths)
 {
   return ths->err_;
 }
 
-extern "C" CanHaveError * new_aspell_document_checker(Speller * speller)
+extern "C" ASPELL_API CanHaveError * new_aspell_document_checker(Speller * speller)
 {
   PosibErr<DocumentChecker *> ret = new_document_checker(speller);
   if (ret.has_err()) {
@@ -47,27 +50,27 @@
   }
 }
 
-extern "C" DocumentChecker * to_aspell_document_checker(CanHaveError * obj)
+extern "C" ASPELL_API DocumentChecker * to_aspell_document_checker(CanHaveError * obj)
 {
   return static_cast<DocumentChecker *>(obj);
 }
 
-extern "C" void aspell_document_checker_reset(DocumentChecker * ths)
+extern "C" ASPELL_API void aspell_document_checker_reset(DocumentChecker * ths)
 {
   ths->reset();
 }
 
-extern "C" void aspell_document_checker_process(DocumentChecker * ths, const char * str, int size)
+extern "C" ASPELL_API void aspell_document_checker_process(DocumentChecker * ths, const char * str, int size)
 {
   ths->process(str, size);
 }
 
-extern "C" Token aspell_document_checker_next_misspelling(DocumentChecker * ths)
+extern "C" ASPELL_API Token aspell_document_checker_next_misspelling(DocumentChecker * ths)
 {
   return ths->next_misspelling();
 }
 
-extern "C" Filter * aspell_document_checker_filter(DocumentChecker * ths)
+extern "C" ASPELL_API Filter * aspell_document_checker_filter(DocumentChecker * ths)
 {
   return ths->filter();
 }
diff -rubw aspell-0.50.4.1/lib/error-c.cpp aspell-win32/lib/error-c.cpp
--- aspell-0.50.4.1/lib/error-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/error-c.cpp	2004-01-06 15:30:37.000000000 -0500
@@ -7,6 +7,9 @@
  * at http://www.gnu.org/.                                              */
 
 #include "error.hpp"
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 
 namespace acommon {
 
diff -rubw aspell-0.50.4.1/lib/filter-c.cpp aspell-win32/lib/filter-c.cpp
--- aspell-0.50.4.1/lib/filter-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/filter-c.cpp	2004-01-06 15:30:39.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "error.hpp"
 #include "filter.hpp"
 
@@ -15,27 +18,27 @@
 struct Error;
 class Filter;
 
-extern "C" void delete_aspell_filter(Filter * ths)
+extern "C" ASPELL_API void delete_aspell_filter(Filter * ths)
 {
   delete ths;
 }
 
-extern "C" unsigned int aspell_filter_error_number(const Filter * ths)
+extern "C" ASPELL_API unsigned int aspell_filter_error_number(const Filter * ths)
 {
   return ths->err_ == 0 ? 0 : 1;
 }
 
-extern "C" const char * aspell_filter_error_message(const Filter * ths)
+extern "C" ASPELL_API const char * aspell_filter_error_message(const Filter * ths)
 {
   return ths->err_ ? ths->err_->mesg : "";
 }
 
-extern "C" const Error * aspell_filter_error(const Filter * ths)
+extern "C" ASPELL_API const Error * aspell_filter_error(const Filter * ths)
 {
   return ths->err_;
 }
 
-extern "C" Filter * to_aspell_filter(CanHaveError * obj)
+extern "C" ASPELL_API Filter * to_aspell_filter(CanHaveError * obj)
 {
   return static_cast<Filter *>(obj);
 }
diff -rubw aspell-0.50.4.1/lib/find_speller.cpp aspell-win32/lib/find_speller.cpp
--- aspell-0.50.4.1/lib/find_speller.cpp	2002-08-18 08:52:02.000000000 -0400
+++ aspell-win32/lib/find_speller.cpp	2004-01-06 15:30:41.000000000 -0500
@@ -9,7 +9,10 @@
 
 // POSIX includes
 #include <sys/types.h>
+#ifdef WIN32PORT
+#else
 #include <dirent.h>
+#endif
 
 #include "asc_ctype.hpp"
 #include "can_have_error.hpp"
diff -rubw aspell-0.50.4.1/lib/info-c.cpp aspell-win32/lib/info-c.cpp
--- aspell-0.50.4.1/lib/info-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/info-c.cpp	2004-01-06 15:30:43.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "info.hpp"
 
 namespace acommon {
@@ -18,92 +21,92 @@
 class ModuleInfoEnumeration;
 class ModuleInfoList;
 
-extern "C" ModuleInfoList * get_aspell_module_info_list(Config * config)
+extern "C" ASPELL_API ModuleInfoList * get_aspell_module_info_list(Config * config)
 {
   return get_module_info_list(config);
 }
 
-extern "C" int aspell_module_info_list_empty(const ModuleInfoList * ths)
+extern "C" ASPELL_API int aspell_module_info_list_empty(const ModuleInfoList * ths)
 {
   return ths->empty();
 }
 
-extern "C" unsigned int aspell_module_info_list_size(const ModuleInfoList * ths)
+extern "C" ASPELL_API unsigned int aspell_module_info_list_size(const ModuleInfoList * ths)
 {
   return ths->size();
 }
 
-extern "C" ModuleInfoEnumeration * aspell_module_info_list_elements(const ModuleInfoList * ths)
+extern "C" ASPELL_API ModuleInfoEnumeration * aspell_module_info_list_elements(const ModuleInfoList * ths)
 {
   return ths->elements();
 }
 
-extern "C" DictInfoList * get_aspell_dict_info_list(Config * config)
+extern "C" ASPELL_API DictInfoList * get_aspell_dict_info_list(Config * config)
 {
   return get_dict_info_list(config);
 }
 
-extern "C" int aspell_dict_info_list_empty(const DictInfoList * ths)
+extern "C" ASPELL_API int aspell_dict_info_list_empty(const DictInfoList * ths)
 {
   return ths->empty();
 }
 
-extern "C" unsigned int aspell_dict_info_list_size(const DictInfoList * ths)
+extern "C" ASPELL_API unsigned int aspell_dict_info_list_size(const DictInfoList * ths)
 {
   return ths->size();
 }
 
-extern "C" DictInfoEnumeration * aspell_dict_info_list_elements(const DictInfoList * ths)
+extern "C" ASPELL_API DictInfoEnumeration * aspell_dict_info_list_elements(const DictInfoList * ths)
 {
   return ths->elements();
 }
 
-extern "C" int aspell_module_info_enumeration_at_end(const ModuleInfoEnumeration * ths)
+extern "C" ASPELL_API int aspell_module_info_enumeration_at_end(const ModuleInfoEnumeration * ths)
 {
   return ths->at_end();
 }
 
-extern "C" const ModuleInfo * aspell_module_info_enumeration_next(ModuleInfoEnumeration * ths)
+extern "C" ASPELL_API const ModuleInfo * aspell_module_info_enumeration_next(ModuleInfoEnumeration * ths)
 {
   return ths->next();
 }
 
-extern "C" void delete_aspell_module_info_enumeration(ModuleInfoEnumeration * ths)
+extern "C" ASPELL_API void delete_aspell_module_info_enumeration(ModuleInfoEnumeration * ths)
 {
   delete ths;
 }
 
-extern "C" ModuleInfoEnumeration * aspell_module_info_enumeration_clone(const ModuleInfoEnumeration * ths)
+extern "C" ASPELL_API ModuleInfoEnumeration * aspell_module_info_enumeration_clone(const ModuleInfoEnumeration * ths)
 {
   return ths->clone();
 }
 
-extern "C" void aspell_module_info_enumeration_assign(ModuleInfoEnumeration * ths, const ModuleInfoEnumeration * other)
+extern "C" ASPELL_API void aspell_module_info_enumeration_assign(ModuleInfoEnumeration * ths, const ModuleInfoEnumeration * other)
 {
   ths->assign(other);
 }
 
-extern "C" int aspell_dict_info_enumeration_at_end(const DictInfoEnumeration * ths)
+extern "C" ASPELL_API int aspell_dict_info_enumeration_at_end(const DictInfoEnumeration * ths)
 {
   return ths->at_end();
 }
 
-extern "C" const DictInfo * aspell_dict_info_enumeration_next(DictInfoEnumeration * ths)
+extern "C" ASPELL_API const DictInfo * aspell_dict_info_enumeration_next(DictInfoEnumeration * ths)
 {
   return ths->next();
 }
 
-extern "C" void delete_aspell_dict_info_enumeration(DictInfoEnumeration * ths)
+extern "C" ASPELL_API void delete_aspell_dict_info_enumeration(DictInfoEnumeration * ths)
 {
   delete ths;
 }
 
-extern "C" DictInfoEnumeration * aspell_dict_info_enumeration_clone(const DictInfoEnumeration * ths)
+extern "C" ASPELL_API DictInfoEnumeration * aspell_dict_info_enumeration_clone(const DictInfoEnumeration * ths)
 {
   return ths->clone();
 }
 
-extern "C" void aspell_dict_info_enumeration_assign(DictInfoEnumeration * ths, const DictInfoEnumeration * other)
+extern "C" ASPELL_API void aspell_dict_info_enumeration_assign(DictInfoEnumeration * ths, const DictInfoEnumeration * other)
 {
   ths->assign(other);
 }
diff -rubw aspell-0.50.4.1/lib/mutable_container-c.cpp aspell-win32/lib/mutable_container-c.cpp
--- aspell-0.50.4.1/lib/mutable_container-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/mutable_container-c.cpp	2004-01-06 15:30:45.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "mutable_container.hpp"
 #include "posib_err.hpp"
 
@@ -13,22 +16,22 @@
 
 class MutableContainer;
 
-extern "C" int aspell_mutable_container_add(MutableContainer * ths, const char * to_add)
+extern "C" ASPELL_API int aspell_mutable_container_add(MutableContainer * ths, const char * to_add)
 {
   return ths->add(to_add);
 }
 
-extern "C" int aspell_mutable_container_remove(MutableContainer * ths, const char * to_rem)
+extern "C" ASPELL_API int aspell_mutable_container_remove(MutableContainer * ths, const char * to_rem)
 {
   return ths->remove(to_rem);
 }
 
-extern "C" void aspell_mutable_container_clear(MutableContainer * ths)
+extern "C" ASPELL_API void aspell_mutable_container_clear(MutableContainer * ths)
 {
   ths->clear();
 }
 
-extern "C" MutableContainer * aspell_mutable_container_to_mutable_container(MutableContainer * ths)
+extern "C" ASPELL_API MutableContainer * aspell_mutable_container_to_mutable_container(MutableContainer * ths)
 {
   return ths;
 }
diff -rubw aspell-0.50.4.1/lib/new_config.cpp aspell-win32/lib/new_config.cpp
--- aspell-0.50.4.1/lib/new_config.cpp	2002-07-26 22:27:10.000000000 -0400
+++ aspell-win32/lib/new_config.cpp	2004-01-06 15:30:47.000000000 -0500
@@ -38,7 +38,11 @@
     Config * config;
     ModeNotifierImpl(Config * c) : config(c) {}
     
+#ifdef WIN32PORT
+    Notifier * clone(Config * c) const {return new ModeNotifierImpl(c);} //FB
+#else
     ModeNotifierImpl * clone(Config * c) const {return new ModeNotifierImpl(c);}
+#endif
     PosibErr<void> item_updated(const KeyInfo * ki, ParmString value) {
       if (strcmp(ki->name, "mode") == 0) {
 
diff -rubw aspell-0.50.4.1/lib/speller-c.cpp aspell-win32/lib/speller-c.cpp
--- aspell-0.50.4.1/lib/speller-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/speller-c.cpp	2004-01-16 08:50:33.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "convert.hpp"
 #include "error.hpp"
 #include "mutable_string.hpp"
@@ -21,7 +24,7 @@
 class Speller;
 class WordList;
 
-extern "C" CanHaveError * new_aspell_speller(Config * config)
+extern "C" ASPELL_API CanHaveError * new_aspell_speller(Config * config)
 {
   PosibErr<Speller *> ret = new_speller(config);
   if (ret.has_err()) {
@@ -31,37 +34,37 @@
   }
 }
 
-extern "C" Speller * to_aspell_speller(CanHaveError * obj)
+extern "C" ASPELL_API Speller * to_aspell_speller(CanHaveError * obj)
 {
   return static_cast<Speller *>(obj);
 }
 
-extern "C" void delete_aspell_speller(Speller * ths)
+extern "C" ASPELL_API void delete_aspell_speller(Speller * ths)
 {
   delete ths;
 }
 
-extern "C" unsigned int aspell_speller_error_number(const Speller * ths)
+extern "C" ASPELL_API unsigned int aspell_speller_error_number(const Speller * ths)
 {
   return ths->err_ == 0 ? 0 : 1;
 }
 
-extern "C" const char * aspell_speller_error_message(const Speller * ths)
+extern "C" ASPELL_API const char * aspell_speller_error_message(const Speller * ths)
 {
   return ths->err_ ? ths->err_->mesg : "";
 }
 
-extern "C" const Error * aspell_speller_error(const Speller * ths)
+extern "C" ASPELL_API const Error * aspell_speller_error(const Speller * ths)
 {
   return ths->err_;
 }
 
-extern "C" Config * aspell_speller_config(Speller * ths)
+extern "C" ASPELL_API Config * aspell_speller_config(Speller * ths)
 {
   return ths->config();
 }
 
-extern "C" int aspell_speller_check(Speller * ths, const char * word, int word_size)
+extern "C" ASPELL_API int aspell_speller_check(Speller * ths, const char * word, int word_size)
 {
   ths->temp_str_0.clear();
   ths->to_internal_->convert(word, word_size, ths->temp_str_0);
@@ -74,7 +77,7 @@
   return ret.data;
 }
 
-extern "C" int aspell_speller_add_to_personal(Speller * ths, const char * word, int word_size)
+extern "C" ASPELL_API int aspell_speller_add_to_personal(Speller * ths, const char * word, int word_size)
 {
   ths->temp_str_0.clear();
   ths->to_internal_->convert(word, word_size, ths->temp_str_0);
@@ -87,7 +90,7 @@
   return 1;
 }
 
-extern "C" int aspell_speller_add_to_session(Speller * ths, const char * word, int word_size)
+extern "C" ASPELL_API int aspell_speller_add_to_session(Speller * ths, const char * word, int word_size)
 {
   ths->temp_str_0.clear();
   ths->to_internal_->convert(word, word_size, ths->temp_str_0);
@@ -100,7 +103,7 @@
   return 1;
 }
 
-extern "C" const WordList * aspell_speller_personal_word_list(Speller * ths)
+extern "C" ASPELL_API const WordList * aspell_speller_personal_word_list(Speller * ths)
 {
   PosibErr<const WordList *> ret = ths->personal_word_list();
   ths->err_.reset(ret.release_err());
@@ -109,7 +112,7 @@
   return ret.data;
 }
 
-extern "C" const WordList * aspell_speller_session_word_list(Speller * ths)
+extern "C" ASPELL_API const WordList * aspell_speller_session_word_list(Speller * ths)
 {
   PosibErr<const WordList *> ret = ths->session_word_list();
   ths->err_.reset(ret.release_err());
@@ -118,7 +121,7 @@
   return ret.data;
 }
 
-extern "C" const WordList * aspell_speller_main_word_list(Speller * ths)
+extern "C" ASPELL_API const WordList * aspell_speller_main_word_list(Speller * ths)
 {
   PosibErr<const WordList *> ret = ths->main_word_list();
   ths->err_.reset(ret.release_err());
@@ -127,7 +130,7 @@
   return ret.data;
 }
 
-extern "C" int aspell_speller_save_all_word_lists(Speller * ths)
+extern "C" ASPELL_API int aspell_speller_save_all_word_lists(Speller * ths)
 {
   PosibErr<void> ret = ths->save_all_word_lists();
   ths->err_.reset(ret.release_err());
@@ -135,7 +138,7 @@
   return 1;
 }
 
-extern "C" int aspell_speller_clear_session(Speller * ths)
+extern "C" ASPELL_API int aspell_speller_clear_session(Speller * ths)
 {
   PosibErr<void> ret = ths->clear_session();
   ths->err_.reset(ret.release_err());
@@ -143,7 +146,7 @@
   return 1;
 }
 
-extern "C" const WordList * aspell_speller_suggest(Speller * ths, const char * word, int word_size)
+extern "C" ASPELL_API const WordList * aspell_speller_suggest(Speller * ths, const char * word, int word_size)
 {
   ths->temp_str_0.clear();
   ths->to_internal_->convert(word, word_size, ths->temp_str_0);
@@ -157,7 +160,7 @@
   return ret.data;
 }
 
-extern "C" int aspell_speller_store_replacement(Speller * ths, const char * mis, int mis_size, const char * cor, int cor_size)
+extern "C" ASPELL_API int aspell_speller_store_replacement(Speller * ths, const char * mis, int mis_size, const char * cor, int cor_size)
 {
   ths->temp_str_0.clear();
   ths->to_internal_->convert(mis, mis_size, ths->temp_str_0);
diff -rubw aspell-0.50.4.1/lib/string_enumeration-c.cpp aspell-win32/lib/string_enumeration-c.cpp
--- aspell-0.50.4.1/lib/string_enumeration-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/string_enumeration-c.cpp	2004-01-06 15:30:50.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "convert.hpp"
 #include "string_enumeration.hpp"
 
@@ -13,27 +16,27 @@
 
 class StringEnumeration;
 
-extern "C" void delete_aspell_string_enumeration(StringEnumeration * ths)
+extern "C" ASPELL_API void delete_aspell_string_enumeration(StringEnumeration * ths)
 {
   delete ths;
 }
 
-extern "C" StringEnumeration * aspell_string_enumeration_clone(const StringEnumeration * ths)
+extern "C" ASPELL_API StringEnumeration * aspell_string_enumeration_clone(const StringEnumeration * ths)
 {
   return ths->clone();
 }
 
-extern "C" void aspell_string_enumeration_assign(StringEnumeration * ths, const StringEnumeration * other)
+extern "C" ASPELL_API void aspell_string_enumeration_assign(StringEnumeration * ths, const StringEnumeration * other)
 {
   ths->assign(other);
 }
 
-extern "C" int aspell_string_enumeration_at_end(const StringEnumeration * ths)
+extern "C" ASPELL_API int aspell_string_enumeration_at_end(const StringEnumeration * ths)
 {
   return ths->at_end();
 }
 
-extern "C" const char * aspell_string_enumeration_next(StringEnumeration * ths)
+extern "C" ASPELL_API const char * aspell_string_enumeration_next(StringEnumeration * ths)
 {
   const char * s = ths->next();
   if (s == 0 || ths->from_internal_ == 0) {
diff -rubw aspell-0.50.4.1/lib/string_list-c.cpp aspell-win32/lib/string_list-c.cpp
--- aspell-0.50.4.1/lib/string_list-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/string_list-c.cpp	2004-01-06 15:30:51.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "posib_err.hpp"
 #include "string_list.hpp"
 
@@ -15,57 +18,57 @@
 class StringEnumeration;
 class StringList;
 
-extern "C" StringList * new_aspell_string_list()
+extern "C" ASPELL_API StringList * new_aspell_string_list()
 {
   return new_string_list();
 }
 
-extern "C" int aspell_string_list_empty(const StringList * ths)
+extern "C" ASPELL_API int aspell_string_list_empty(const StringList * ths)
 {
   return ths->empty();
 }
 
-extern "C" unsigned int aspell_string_list_size(const StringList * ths)
+extern "C" ASPELL_API unsigned int aspell_string_list_size(const StringList * ths)
 {
   return ths->size();
 }
 
-extern "C" StringEnumeration * aspell_string_list_elements(const StringList * ths)
+extern "C" ASPELL_API StringEnumeration * aspell_string_list_elements(const StringList * ths)
 {
   return ths->elements();
 }
 
-extern "C" int aspell_string_list_add(StringList * ths, const char * to_add)
+extern "C" ASPELL_API int aspell_string_list_add(StringList * ths, const char * to_add)
 {
   return ths->add(to_add);
 }
 
-extern "C" int aspell_string_list_remove(StringList * ths, const char * to_rem)
+extern "C" ASPELL_API int aspell_string_list_remove(StringList * ths, const char * to_rem)
 {
   return ths->remove(to_rem);
 }
 
-extern "C" void aspell_string_list_clear(StringList * ths)
+extern "C" ASPELL_API void aspell_string_list_clear(StringList * ths)
 {
   ths->clear();
 }
 
-extern "C" MutableContainer * aspell_string_list_to_mutable_container(StringList * ths)
+extern "C" ASPELL_API MutableContainer * aspell_string_list_to_mutable_container(StringList * ths)
 {
   return ths;
 }
 
-extern "C" void delete_aspell_string_list(StringList * ths)
+extern "C" ASPELL_API void delete_aspell_string_list(StringList * ths)
 {
   delete ths;
 }
 
-extern "C" StringList * aspell_string_list_clone(const StringList * ths)
+extern "C" ASPELL_API StringList * aspell_string_list_clone(const StringList * ths)
 {
   return ths->clone();
 }
 
-extern "C" void aspell_string_list_assign(StringList * ths, const StringList * other)
+extern "C" ASPELL_API void aspell_string_list_assign(StringList * ths, const StringList * other)
 {
   ths->assign(other);
 }
diff -rubw aspell-0.50.4.1/lib/string_map-c.cpp aspell-win32/lib/string_map-c.cpp
--- aspell-0.50.4.1/lib/string_map-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/string_map-c.cpp	2004-01-06 15:30:53.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "posib_err.hpp"
 #include "string_map.hpp"
 
@@ -15,72 +18,72 @@
 class StringMap;
 class StringPairEnumeration;
 
-extern "C" StringMap * new_aspell_string_map()
+extern "C" ASPELL_API StringMap * new_aspell_string_map()
 {
   return new_string_map();
 }
 
-extern "C" int aspell_string_map_add(StringMap * ths, const char * to_add)
+extern "C" ASPELL_API int aspell_string_map_add(StringMap * ths, const char * to_add)
 {
   return ths->add(to_add);
 }
 
-extern "C" int aspell_string_map_remove(StringMap * ths, const char * to_rem)
+extern "C" ASPELL_API int aspell_string_map_remove(StringMap * ths, const char * to_rem)
 {
   return ths->remove(to_rem);
 }
 
-extern "C" void aspell_string_map_clear(StringMap * ths)
+extern "C" ASPELL_API void aspell_string_map_clear(StringMap * ths)
 {
   ths->clear();
 }
 
-extern "C" MutableContainer * aspell_string_map_to_mutable_container(StringMap * ths)
+extern "C" ASPELL_API MutableContainer * aspell_string_map_to_mutable_container(StringMap * ths)
 {
   return ths;
 }
 
-extern "C" void delete_aspell_string_map(StringMap * ths)
+extern "C" ASPELL_API void delete_aspell_string_map(StringMap * ths)
 {
   delete ths;
 }
 
-extern "C" StringMap * aspell_string_map_clone(const StringMap * ths)
+extern "C" ASPELL_API StringMap * aspell_string_map_clone(const StringMap * ths)
 {
   return ths->clone();
 }
 
-extern "C" void aspell_string_map_assign(StringMap * ths, const StringMap * other)
+extern "C" ASPELL_API void aspell_string_map_assign(StringMap * ths, const StringMap * other)
 {
   ths->assign(other);
 }
 
-extern "C" int aspell_string_map_empty(const StringMap * ths)
+extern "C" ASPELL_API int aspell_string_map_empty(const StringMap * ths)
 {
   return ths->empty();
 }
 
-extern "C" unsigned int aspell_string_map_size(const StringMap * ths)
+extern "C" ASPELL_API unsigned int aspell_string_map_size(const StringMap * ths)
 {
   return ths->size();
 }
 
-extern "C" StringPairEnumeration * aspell_string_map_elements(const StringMap * ths)
+extern "C" ASPELL_API StringPairEnumeration * aspell_string_map_elements(const StringMap * ths)
 {
   return ths->elements();
 }
 
-extern "C" int aspell_string_map_insert(StringMap * ths, const char * key, const char * value)
+extern "C" ASPELL_API int aspell_string_map_insert(StringMap * ths, const char * key, const char * value)
 {
   return ths->insert(key, value);
 }
 
-extern "C" int aspell_string_map_replace(StringMap * ths, const char * key, const char * value)
+extern "C" ASPELL_API int aspell_string_map_replace(StringMap * ths, const char * key, const char * value)
 {
   return ths->replace(key, value);
 }
 
-extern "C" const char * aspell_string_map_lookup(const StringMap * ths, const char * key)
+extern "C" ASPELL_API const char * aspell_string_map_lookup(const StringMap * ths, const char * key)
 {
   return ths->lookup(key);
 }
diff -rubw aspell-0.50.4.1/lib/string_pair_enumeration-c.cpp aspell-win32/lib/string_pair_enumeration-c.cpp
--- aspell-0.50.4.1/lib/string_pair_enumeration-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/string_pair_enumeration-c.cpp	2004-01-06 15:30:55.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "string_pair.hpp"
 #include "string_pair_enumeration.hpp"
 
@@ -13,27 +16,34 @@
 
 class StringPairEnumeration;
 
-extern "C" int aspell_string_pair_enumeration_at_end(const StringPairEnumeration * ths)
+extern "C" ASPELL_API int aspell_string_pair_enumeration_at_end(const StringPairEnumeration * ths)
 {
   return ths->at_end();
 }
 
+#ifdef WIN32PORT
+extern "C" ASPELL_API StringPair* aspell_string_pair_enumeration_next(StringPairEnumeration * ths)
+{
+  return &ths->next();
+}
+#else
 extern "C" StringPair aspell_string_pair_enumeration_next(StringPairEnumeration * ths)
 {
   return ths->next();
 }
+#endif
 
-extern "C" void delete_aspell_string_pair_enumeration(StringPairEnumeration * ths)
+extern "C" ASPELL_API void delete_aspell_string_pair_enumeration(StringPairEnumeration * ths)
 {
   delete ths;
 }
 
-extern "C" StringPairEnumeration * aspell_string_pair_enumeration_clone(const StringPairEnumeration * ths)
+extern "C" ASPELL_API StringPairEnumeration * aspell_string_pair_enumeration_clone(const StringPairEnumeration * ths)
 {
   return ths->clone();
 }
 
-extern "C" void aspell_string_pair_enumeration_assign(StringPairEnumeration * ths, const StringPairEnumeration * other)
+extern "C" ASPELL_API void aspell_string_pair_enumeration_assign(StringPairEnumeration * ths, const StringPairEnumeration * other)
 {
   ths->assign(other);
 }
diff -rubw aspell-0.50.4.1/lib/word_list-c.cpp aspell-win32/lib/word_list-c.cpp
--- aspell-0.50.4.1/lib/word_list-c.cpp	2002-08-30 15:20:36.000000000 -0400
+++ aspell-win32/lib/word_list-c.cpp	2004-01-06 15:30:57.000000000 -0500
@@ -6,6 +6,9 @@
  * LGPL license along with this library if you did not you can find it
  * at http://www.gnu.org/.                                              */
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "string_enumeration.hpp"
 #include "word_list.hpp"
 
@@ -14,17 +17,17 @@
 class StringEnumeration;
 class WordList;
 
-extern "C" int aspell_word_list_empty(const WordList * ths)
+extern "C" ASPELL_API int aspell_word_list_empty(const WordList * ths)
 {
   return ths->empty();
 }
 
-extern "C" unsigned int aspell_word_list_size(const WordList * ths)
+extern "C" ASPELL_API unsigned int aspell_word_list_size(const WordList * ths)
 {
   return ths->size();
 }
 
-extern "C" StringEnumeration * aspell_word_list_elements(const WordList * ths)
+extern "C" ASPELL_API StringEnumeration * aspell_word_list_elements(const WordList * ths)
 {
   StringEnumeration * els = ths->elements();
   els->from_internal_ = ths->from_internal_;
diff -rubw aspell-0.50.4.1/manual/man-html/4_Customizing.html aspell-win32/manual/man-html/4_Customizing.html
--- aspell-0.50.4.1/manual/man-html/4_Customizing.html	2003-10-11 20:17:36.000000000 -0400
+++ aspell-win32/manual/man-html/4_Customizing.html	2004-01-13 09:30:29.000000000 -0500
@@ -444,7 +444,10 @@
 </DD>
 <DT><STRONG>save-repl</STRONG></DT>
 <DD><I>(boolean)</I> save the replacement word list on save
-allkeyboard <I>(file)</I> the base name of the keyboard definition
+all
+</DD>
+<DT><STRONG>keyboard</STRONG></DT>
+<DD><I>(file)</I> the base name of the keyboard definition
 file to use (see section <A HREF="4_Customizing.html#typo">4.4.3</A>)
 </DD>
 <DT><STRONG>sug-mode</STRONG></DT>
diff -rubw aspell-0.50.4.1/modules/speller/default/block_vector.hpp aspell-win32/modules/speller/default/block_vector.hpp
--- aspell-0.50.4.1/modules/speller/default/block_vector.hpp	2001-11-29 22:55:48.000000000 -0500
+++ aspell-win32/modules/speller/default/block_vector.hpp	2004-01-06 15:31:07.000000000 -0500
@@ -30,7 +30,13 @@
     typedef T &       reference;
     typedef const T & const_reference;
     typedef T *       pointer;
+#ifdef WIN32PORT
+    typedef T *       _Tptr; //FB
+#endif
     typedef T *       const_pointer;
+#ifdef WIN32PORT
+    typedef T *       _Ctptr; //FB;
+#endif
     typedef std::random_access_iterator_tag  iterator_category;
     typedef ptrdiff_t                        distance_type;
 
diff -rubw aspell-0.50.4.1/modules/speller/default/data.cpp aspell-win32/modules/speller/default/data.cpp
--- aspell-0.50.4.1/modules/speller/default/data.cpp	2003-01-13 06:14:02.000000000 -0500
+++ aspell-win32/modules/speller/default/data.cpp	2004-01-06 15:31:11.000000000 -0500
@@ -73,7 +73,11 @@
   }
 
   bool DataSet::is_attached() const {
+#ifdef WIN32PORT
+    return attach_count_ == 0; //FB
+#else
     return attach_count_;
+#endif
   }
 
   const char * DataSet::lang_name() const {
diff -rubw aspell-0.50.4.1/modules/speller/default/data.hpp aspell-win32/modules/speller/default/data.hpp
--- aspell-0.50.4.1/modules/speller/default/data.hpp	2003-01-13 06:12:44.000000000 -0500
+++ aspell-win32/modules/speller/default/data.hpp	2004-01-16 08:55:02.000000000 -0500
@@ -5,6 +5,9 @@
 
 #include <assert.h>
 
+#ifdef WIN32PORT
+#include "aspellroot.h"
+#endif
 #include "copy_ptr.hpp"
 #include "enumeration.hpp"
 #include "language.hpp"
@@ -26,7 +29,13 @@
   class SpellerImpl;
   class Language;
 
+#ifdef WIN32PORT
+#pragma warning( disable : 4099 )
+#endif
   class SensitiveCompare;
+#ifdef WIN32PORT
+#pragma warning( default : 4099 )
+#endif
 
   class DataSet {
     friend class SpellerImpl;
@@ -101,7 +110,7 @@
     virtual PosibErr<void> clear() = 0;
   };
 
-  struct CompoundInfo {
+  struct ASPELL_API CompoundInfo {
     unsigned char d;
     
     CompoundInfo(unsigned char d0 = 0) : d(d0) {}
@@ -113,19 +122,39 @@
       d |= c;
     }
 
+#ifdef WIN32PORT
+    bool mid_required ()       const {return (d & 1<<2) != 0; } //FB
+#else
     bool mid_required ()       const {return d & 1<<2; }
+#endif
     void mid_required (bool c)       { d |= c<<2;}
     
+#ifdef WIN32PORT
+    bool beg () const {return (d & 1<<3) != 0;} //FB
+#else
     bool beg () const {return d & 1<<3;}
+#endif
     void beg (bool c) {d |= c<<3;}
 
+#ifdef WIN32PORT
+    bool mid () const {return (d & 1<<4) != 0;} //FB
+#else
     bool mid () const {return d & 1<<4;}
+#endif
     void mid (bool c) {d |= c<<4;}
 
+#ifdef WIN32PORT
+    bool end () const {return (d & 1<<5) != 0;} //FB
+#else
     bool end () const {return d & 1<<5;}
+#endif
     void end (bool c) {d |= c<<5;}
 
+#ifdef WIN32PORT
+    bool any() const {return (d & (1<<3|1<<4|1<<5)) != 0;} //FB
+#else
     bool any() const {return d & (1<<3|1<<4|1<<5);}
+#endif
 
     const char * read(const char * str, const Language & l);
     OStream & write(OStream &, const Language & l) const;
@@ -143,7 +172,11 @@
     const char * soundslike;
     const void * word_list_pointer;
 
+#ifdef WIN32PORT
+    operator bool () const {return soundslike != 0;} //FB
+#else
     operator bool () const {return soundslike;}
+#endif
   
     SoundslikeWord() : soundslike(0) {}
     SoundslikeWord(const char * w, const void * p) 
@@ -152,7 +185,7 @@
 
   static const unsigned int MaxCompoundLength = 8;
 
-  struct BasicWordInfo {
+  struct ASPELL_API BasicWordInfo {
     const char * word;
     CompoundInfo compound;
     BasicWordInfo(const char * w = 0, CompoundInfo c = 0)
@@ -189,7 +222,7 @@
 		    const ConvertWord &) const;
   };
 
-  struct LocalWordSetInfo 
+  struct ASPELL_API LocalWordSetInfo 
   {
     SensitiveCompare compare;
     ConvertWord      convert;
@@ -328,7 +361,7 @@
   static const DataType DT_Multi        = 1<<3;
   static const DataType DT_Any          = 0xFF;
 
-  PosibErr<LoadableDataSet *> add_data_set(ParmString file_name,
+  PosibErr<LoadableDataSet *> ASPELL_API add_data_set(ParmString file_name,
 					   Config &,
 					   SpellerImpl * = 0,
 					   const LocalWordSetInfo * = 0,
@@ -336,18 +369,18 @@
 					   DataType allowed = DT_Any);
   
   // implemented in readonly_ws.cc
-  BasicWordSet * new_default_readonly_word_set();
-  PosibErr<void> create_default_readonly_word_set(StringEnumeration * els,
+  ASPELL_API BasicWordSet * new_default_readonly_word_set();
+  ASPELL_API PosibErr<void> create_default_readonly_word_set(StringEnumeration * els,
                                                   Config & config);
 
   // implemented in multi_ws.cc
-  BasicMultiSet * new_default_multi_word_set();
+  ASPELL_API BasicMultiSet * new_default_multi_word_set();
 
   // implemented in writable_ws.cc
-  WritableWordSet * new_default_writable_word_set();
+  ASPELL_API WritableWordSet * new_default_writable_word_set();
 
   // implemented in writable_repl.cc
-  WritableReplacementSet * new_default_writable_replacement_set();
+  ASPELL_API WritableReplacementSet * new_default_writable_replacement_set();
 
   
 }
diff -rubw aspell-0.50.4.1/modules/speller/default/language.cpp aspell-win32/modules/speller/default/language.cpp
--- aspell-0.50.4.1/modules/speller/default/language.cpp	2002-07-24 04:02:52.000000000 -0400
+++ aspell-win32/modules/speller/default/language.cpp	2004-01-06 15:31:22.000000000 -0500
@@ -107,6 +107,21 @@
     String temp;
     char_data.getline(temp);
     char_data.getline(temp);
+#ifdef WIN32PORT
+    for (int j = 0; j != 256; ++j) { //FB
+      char_data >> to_uni_[j]; //FB
+      char_data >> temp;
+      char_type_[j] = temp == "letter" ? letter //FB
+	: temp == "space"  ? space 
+	: other;
+      int num = -1;
+      char_data >> num; to_lower_[j]    = static_cast<char>(num); //FB
+      char_data >> num; to_upper_[j]    = static_cast<char>(num); //FB
+      char_data >> num; to_title_[j]    = static_cast<char>(num); //FB
+      char_data >> num; to_sl_[j]       = static_cast<char>(num); //FB
+      char_data >> num; to_stripped_[j] = static_cast<char>(num); //FB
+      char_data >> num; de_accent_[j] = static_cast<char>(num); //FB
+#else
     for (int i = 0; i != 256; ++i) {
       char_data >> to_uni_[i];
       char_data >> temp;
@@ -120,6 +135,7 @@
       char_data >> num; to_sl_[i]       = static_cast<char>(num);
       char_data >> num; to_stripped_[i] = static_cast<char>(num);
       char_data >> num; de_accent_[i] = static_cast<char>(num);
+#endif
       if (char_data.peek() != '\n') 
 	return make_err(bad_file_format, char_data_name);
     }
@@ -128,10 +144,31 @@
     //
     //
     
+#ifdef WIN32PORT
+    for (j = 0; j != 256; ++j) //FB
+      to_normalized_[j] = 0; //FB
+#else
     for (int i = 0; i != 256; ++i) 
       to_normalized_[i] = 0;
+#endif
 
     int c = 1;
+#ifdef WIN32PORT
+    for (j = 0; j != 256; ++j) {//FB
+      if (is_alpha(j)) { //FB
+        if (to_normalized_[to_uchar(to_stripped_[j])] == 0) { //FB
+	        to_normalized_[j] = c; //FB
+	        to_normalized_[to_uchar(to_stripped_[j])] = c; //FB
+	  ++c;
+	} else {
+	        to_normalized_[j] = to_normalized_[to_uchar(to_stripped_[j])]; //FB
+	}
+      }
+    }
+    for (j = 0; j != 256; ++j) { //FB
+      if (to_normalized_[j]==0) to_normalized_[j] = c; //FB
+    }
+#else
     for (int i = 0; i != 256; ++i) {
       if (is_alpha(i)) {
 	if (to_normalized_[to_uchar(to_stripped_[i])] == 0) {
@@ -146,6 +183,7 @@
     for (int i = 0; i != 256; ++i) {
       if (to_normalized_[i]==0) to_normalized_[i] = c;
     }
+#endif
     max_normalized_ = c;
 
     //
diff -rubw aspell-0.50.4.1/modules/speller/default/language.hpp aspell-win32/modules/speller/default/language.hpp
--- aspell-0.50.4.1/modules/speller/default/language.hpp	2001-11-29 22:55:48.000000000 -0500
+++ aspell-win32/modules/speller/default/language.hpp	2004-01-02 13:18:20.000000000 -0500
@@ -57,7 +57,7 @@
 
   public:
     Language() {}
-    PosibErr<void> setup(ParmString lang, Config *);
+    ASPELL_API PosibErr<void> setup(ParmString lang, Config *);
 
     const char * data_dir() const {return dir_.c_str();}
     const char * name() const {return name_.c_str();}
@@ -155,7 +155,7 @@
     }
   };
 
-  struct SensitiveCompare {
+  struct ASPELL_API SensitiveCompare {
     const Language * lang;
     bool case_insensitive;
     bool ignore_accents;
@@ -182,7 +182,7 @@
     //   otherwise the casing of tail begin and tail inlist must match
   };
 
-  struct ConvertWord {
+  struct ASPELL_API ConvertWord {
     const Language * lang;
     bool strip_accents;
     ConvertWord(const Language * l = 0)
diff -rubw aspell-0.50.4.1/modules/speller/default/multi_ws.cpp aspell-win32/modules/speller/default/multi_ws.cpp
--- aspell-0.50.4.1/modules/speller/default/multi_ws.cpp	2003-05-12 00:30:14.000000000 -0400
+++ aspell-win32/modules/speller/default/multi_ws.cpp	2004-01-06 15:31:26.000000000 -0500
@@ -87,7 +87,11 @@
 
   MultiWS::VirEmul * MultiWS::detailed_elements() const
   {
+#ifdef WIN32PORT
+    return new MakeVirEnumeration<ElementsParms, VirEnumeration<ElementsParms::Value> >(wss.begin(), wss.end());//FB
+#else
     return new MakeVirEnumeration<ElementsParms>(wss.begin(), wss.end());
+#endif
   }
   
   unsigned int MultiWS::size() const 
diff -rubw aspell-0.50.4.1/modules/speller/default/phonet.cpp aspell-win32/modules/speller/default/phonet.cpp
--- aspell-0.50.4.1/modules/speller/default/phonet.cpp	2002-08-11 09:58:30.000000000 -0400
+++ aspell-win32/modules/speller/default/phonet.cpp	2004-01-06 15:31:28.000000000 -0500
@@ -70,7 +70,11 @@
       *this = *(const PhonetParmsImpl *)other;
       this->rules = &rdata.front();
     }
+#ifdef WIN32PORT
+    PhonetParms * clone() const { //FB ??? (worried)
+#else
     PhonetParmsImpl * clone() const {
+#endif
       PhonetParmsImpl * other = new PhonetParmsImpl(*this);
       return other;
     }
@@ -191,7 +195,11 @@
 
     int i, k;
 
+#ifdef WIN32PORT
+    for (i = 0; i < parms.get_hash_size(); i++) {
+#else
     for (i = 0; i < parms.hash_size; i++) {
+#endif
       parms.hash[i] = -1;
     }
 
diff -rubw aspell-0.50.4.1/modules/speller/default/phonet.hpp aspell-win32/modules/speller/default/phonet.hpp
--- aspell-0.50.4.1/modules/speller/default/phonet.hpp	2001-11-29 22:55:48.000000000 -0500
+++ aspell-win32/modules/speller/default/phonet.hpp	2004-01-06 15:31:31.000000000 -0500
@@ -39,8 +39,13 @@
     char to_upper[256];
     bool is_alpha[256];
 
+#ifdef WIN32PORT
+    int get_hash_size(){ return 256;} //FB
+    int hash[256]; //FB
+#else
     static const int hash_size = 256;
     int hash[hash_size];
+#endif
 
     virtual PhonetParms * clone() const = 0;
     virtual void assign(const PhonetParms *) = 0;
diff -rubw aspell-0.50.4.1/modules/speller/default/phonetic.cpp aspell-win32/modules/speller/default/phonetic.cpp
--- aspell-0.50.4.1/modules/speller/default/phonetic.cpp	2001-11-29 22:55:48.000000000 -0500
+++ aspell-win32/modules/speller/default/phonetic.cpp	2004-01-06 15:31:37.000000000 -0500
@@ -7,6 +7,9 @@
 #include "file_util.hpp"
 #include "file_data_util.hpp"
 #include "clone_ptr-t.hpp"
+#ifdef WIN32PORT
+#include "generic_copy_ptr-t.hpp"
+#endif
 
 #include <vector>
 
@@ -33,7 +36,11 @@
 	  char c = lang->to_sl(static_cast<char>(i));
 	  if (c) chars_set[static_cast<unsigned char>(c)] = true;
 	}
+#ifdef WIN32PORT
+      for (/*int*/ i = 0; i != 256; ++i) //FB
+#else
       for (int i = 0; i != 256; ++i) 
+#endif
 	{
 	  if (chars_set[i]) 
 	    chars_list += static_cast<char>(i);
@@ -86,7 +93,11 @@
 	if (lang->is_alpha(c) || lang->special(c).any())
 	  chars_set[static_cast<unsigned char>(lang->to_stripped(c))] = true;
       }
+#ifdef WIN32PORT
+      for (/*int*/ i = 0; i != 256; ++i) //FB
+#else
       for (int i = 0; i != 256; ++i) 
+#endif
       {
 	if (chars_set[i]) 
 	  chars_list += static_cast<char>(i);
@@ -158,11 +169,19 @@
 	      chars_set[static_cast<unsigned char>(*j)] = true;
 	    }
 	}
+#ifdef WIN32PORT
+      for (int k = 0; k != 256; ++k) //FB
+	{
+	  if (chars_set[k]) //FB
+	    chars_list += static_cast<char>(k); //FB
+	}
+#else
       for (int i = 0; i != 256; ++i) 
 	{
 	  if (chars_set[i]) 
 	    chars_list += static_cast<char>(i);
 	}
+#endif
       return chars_list;
     }
     
@@ -207,6 +226,9 @@
 
 }
 
+#ifdef WIN32PORT
+#else
 namespace acommon {
   template class ClonePtr<aspeller::Soundslike>;
 }
+#endif
diff -rubw aspell-0.50.4.1/modules/speller/default/readonly_ws.cpp aspell-win32/modules/speller/default/readonly_ws.cpp
--- aspell-0.50.4.1/modules/speller/default/readonly_ws.cpp	2002-11-25 19:21:52.000000000 -0500
+++ aspell-win32/modules/speller/default/readonly_ws.cpp	2004-01-06 15:31:48.000000000 -0500
@@ -66,6 +66,9 @@
 // And like the .wrd file the hash table contains offsets not pointers.
 //
 
+#ifdef WIN32PORT
+# pragma warning(disable:4786)
+#endif
 #include <vector>
 
 using std::vector;
@@ -175,7 +178,10 @@
       typedef BlockVector<const u32int> Vector;
       typedef u32int                    Value;
       typedef const char *              Key;
+#ifdef WIN32PORT
+#else
       static const bool is_multi = true;
+#endif
       Key key(Value v) const {assert (v != u32int_max);
 				return block_begin + v;}
       InsensitiveHash  hash;
@@ -192,7 +198,10 @@
       typedef BlockVector<const u32int> Vector;
       typedef u32int                    Value;
       typedef const char *              Key;
+#ifdef WIN32PORT
+#else
       static const bool is_multi = false;
+#endif
       Key key(Value v) const {return block_begin + v;}
       hash<const char *> hash;
       bool equal(Key rhs, Key lhs) const {return strcmp(rhs,lhs) == 0;}
@@ -267,7 +276,11 @@
   };
 
   ReadOnlyWS::VirEmul * ReadOnlyWS::detailed_elements() const {
+#ifdef WIN32PORT
+    return new MakeVirEnumeration<ElementsParms, VirEnumeration<ElementsParms::Value> >
+#else
     return new MakeVirEnumeration<ElementsParms>
+#endif
       (word_lookup.begin(), ElementsParms(block));
   }
 
@@ -512,12 +525,22 @@
 
     if (use_soundslike) {
       
+#ifdef WIN32PORT
+      return new MakeVirEnumeration<SoundslikeElementsParms, //FB
+          VirEnumeration<SoundslikeElementsParms::Value> > //FB
+#else
       return new MakeVirEnumeration<SoundslikeElementsParms>
+#endif
 	(soundslike_lookup.begin(), soundslike_block);
 
     } else {
 
+#ifdef WIN32PORT
+      return new MakeVirEnumeration<SoundslikeElementsParmsNoSL, //FB
+        VirEnumeration<SoundslikeElementsParmsNoSL::Value> > //FB
+#else
       return new MakeVirEnumeration<SoundslikeElementsParmsNoSL>
+#endif
 	(word_lookup.begin(), 
 	 SoundslikeElementsParmsNoSL(max_word_length,block,lang()));
       
@@ -540,7 +563,12 @@
     } else {
 
       WordLookup::ConstFindIterator i = word_lookup.multi_find(soundslike);
+#ifdef WIN32PORT
+      return new MakeVirEnumeration<SoundslikeWordsParmsNoSL,
+        VirEnumeration<SoundslikeWordsParmsNoSL::Value> >(i, block);
+#else
       return new MakeVirEnumeration<SoundslikeWordsParmsNoSL>(i, block);
+#endif
       
     }
     
@@ -554,7 +582,12 @@
       const u32int * end = reinterpret_cast<const u32int *>(w.soundslike - 2);
       u16int size = *reinterpret_cast<const u16int *>(end);
       
+#ifdef WIN32PORT
+      return new MakeVirEnumeration<SoundslikeWordsParms,
+        VirEnumeration<SoundslikeWordsParms::Value> >
+#else
       return new MakeVirEnumeration<SoundslikeWordsParms>
+#endif
 	(end - size, SoundslikeWordsParms(word_block, end));
 
     } else {
@@ -584,7 +617,11 @@
     typedef vector<const char *> Vector;
     typedef const char *         Value;
     typedef const char *         Key;
+#ifdef WIN32PORT
+    static const bool is_multi;//FB = true;
+#else
     static const bool is_multi = true;
+#endif
     const Key & key(const Value & v) const {return v;}
     InsensitiveHash hash_;
     size_t hash(const Key & k) const {return hash_(k);}
@@ -595,6 +632,9 @@
     bool is_nonexistent(const Value & v) const {return v == 0;}
     void make_nonexistent(Value & v) const {v = 0;}
   };
+#ifdef WIN32PORT
+  const bool WordLookupParms::is_multi = true;
+#endif
 
   typedef VectorHashTable<WordLookupParms> WordHash;
 
@@ -610,7 +650,11 @@
     };
     typedef pair<Key, List> Value;
     typedef vector<Value>   Vector;
+#ifdef WIN32PORT
+    static const bool is_multi;//FB = false;
+#else
     static const bool is_multi = false;
+#endif
     const Key & key(const Value & v) const {return v.first;}
     hash<const char *>  hash;
     bool equal(const Key & rhs, const Key & lhs) const {return strcmp(rhs,lhs) == 0;}
@@ -620,6 +664,9 @@
     }
   };
 
+#ifdef WIN32PORT
+  const bool SoundslikeLookupParms::is_multi = false;
+#endif
   typedef VectorHashTable<SoundslikeLookupParms> SoundHash;
 
   static inline unsigned int round_up(unsigned int i, unsigned int size) {
diff -rubw aspell-0.50.4.1/modules/speller/default/simple_string.hpp aspell-win32/modules/speller/default/simple_string.hpp
--- aspell-0.50.4.1/modules/speller/default/simple_string.hpp	2001-11-29 22:55:48.000000000 -0500
+++ aspell-win32/modules/speller/default/simple_string.hpp	2004-01-06 15:31:59.000000000 -0500
@@ -33,7 +33,11 @@
 
     SimpleString(const char * other, int) 
       : str_(other), delete_(false) {}
+#ifdef WIN32PORT
+    ~SimpleString() {if (delete_) delete[] const_cast<char*>(str_);} //FB
+#else
     ~SimpleString() {if (delete_) delete[] str_;}
+#endif
     const char * c_str() const {return str_;}
   };
 
diff -rubw aspell-0.50.4.1/modules/speller/default/speller_impl.cpp aspell-win32/modules/speller/default/speller_impl.cpp
--- aspell-0.50.4.1/modules/speller/default/speller_impl.cpp	2002-09-23 22:30:28.000000000 -0400
+++ aspell-win32/modules/speller/default/speller_impl.cpp	2004-01-16 08:50:32.000000000 -0500
@@ -240,7 +240,11 @@
 	words[0].set(s.word, *i == m ? m : '\0');
 	words[1].clear();
 	if ((!check_if_valid || !c.mid_required()) // if check then !s.mid_required() 
+#ifdef WIN32PORT
+	    && (bool) check(i, word_end, run_together_limit - 1, end_pos, words + 1)) //FB
+#else
 	    && check(i, word_end, run_together_limit - 1, end_pos, words + 1))
+#endif
 	  return true;
 	if ((check_if_valid ? *i == m : strchr(run_together_middle_, *i) != 0) 
 	    && word_end - (i + 1) >= static_cast<int>(run_together_min_)) {
@@ -277,8 +281,12 @@
   }
 
   SpellerImpl::WordLists SpellerImpl::wordlists() const {
-    return WordLists(MakeVirEnumeration<DataSetCollection::Parms>
+#ifdef WIN32PORT
+    return WordLists(MakeVirEnumeration<DataSetCollection::Parms, VirEnumeration<DataSetCollection::Parms::Value> > //FB
 		     (wls_->begin(), DataSetCollection::Parms(wls_->end())));
+#else
+    return WordLists(MakeVirEnumeration<DataSetCollection::Parms>
+#endif
   }
 
   bool SpellerImpl::have(const DataSet::Id &to_find) const {
@@ -520,6 +528,8 @@
     
   };
 
+#ifdef WIN32PORT
+#else
   static UpdateMember update_members[] = 
   {
     {"ignore",         UpdateMember::Int,     UpdateMember::CN::ignore}
@@ -538,11 +548,43 @@
 	UpdateMember::Int,    
 	UpdateMember::CN::run_together_min}
   };
+#endif
 
   template <typename T>
   PosibErr<void> callback(SpellerImpl * m, const KeyInfo * ki, T value, 
 			  UpdateMember::Type t) 
   {
+#ifdef WIN32PORT
+    //FB (well, VC++ gets totally confused by fun)
+    static UpdateMember update_members[9]; 
+    update_members[0].name = "ignore";
+    update_members[0].type = UpdateMember::Int;
+    update_members[0].fun = UpdateMember::CN::ignore;
+    update_members[1].name = "ignore_accents";
+    update_members[1].type = UpdateMember::Bool;
+    update_members[1].fun = UpdateMember::CN::ignore_accents;
+    update_members[2].name = "ignore_case";
+    update_members[2].type = UpdateMember::Bool;
+    update_members[2].fun = UpdateMember::CN::ignore_case;
+    update_members[3].name = "ignore_repl";
+    update_members[3].type = UpdateMember::Bool;
+    update_members[3].fun = UpdateMember::CN::ignore_repl;
+    update_members[4].name = "save_repl";
+    update_members[4].type = UpdateMember::Bool;
+    update_members[4].fun = UpdateMember::CN::save_repl;
+    update_members[5].name = "sug-mode";
+    update_members[5].type = UpdateMember::String;
+    update_members[5].fun = UpdateMember::CN::sug_mode;
+    update_members[6].name = "run-together-min";
+    update_members[6].type = UpdateMember::Bool;
+    update_members[6].fun = UpdateMember::CN::run_together;
+    update_members[7].name = "run-together-limit";
+    update_members[7].type = UpdateMember::Int;
+    update_members[7].fun = UpdateMember::CN::run_together_limit;
+    update_members[8].name = "run-together-min";
+    update_members[8].type = UpdateMember::Int;
+    update_members[8].fun = UpdateMember::CN::run_together_min;
+#endif
     const UpdateMember * i
       = update_members;
     const UpdateMember * end   
@@ -573,7 +615,11 @@
     config_.reset(c);
 
     ignore_repl = config_->retrieve_bool("ignore-repl");
+#ifdef WIN32PORT
+    ignore_count = (unsigned int)config_->retrieve_int("ignore");
+#else
     ignore_count = config_->retrieve_int("ignore");
+#endif
 
     wls_.reset(new DataSetCollection());
 
@@ -638,14 +684,26 @@
     run_together_specified_     = config_->retrieve_bool("run-together-specified");
     run_together_middle_        = lang().mid_chars();
 
+#ifdef WIN32PORT
+    run_together_limit_  = (unsigned int)config_->retrieve_int("run-together-limit"); //FB
+#else
     run_together_limit_  = config_->retrieve_int("run-together-limit");
+#endif
     if (run_together_limit_ > 8) {
       config_->replace("run-together-limit", "8");
       run_together_limit_ = 8;
     }
+#ifdef WIN32PORT
+    run_together_min_    = (unsigned int)config_->retrieve_int("run-together-min"); //FB
+#else
     run_together_min_    = config_->retrieve_int("run-together-min");
+#endif
 
+#ifdef WIN32PORT
+    run_together_start_len_ = (unsigned int)config_->retrieve_int("run-together-specified"); //FB
+#else
     run_together_start_len_ = config_->retrieve_int("run-together-specified");
+#endif
     if (unconditional_run_together_ 
 	&& run_together_min_ < run_together_start_len_)
       run_together_start_len_ = run_together_min_;
@@ -720,7 +778,10 @@
   }
 }
 
+#ifdef WIN32PORT
+#else
 namespace acommon {
   template class CopyPtr<aspeller::Language>;
 }
+#endif
 
diff -rubw aspell-0.50.4.1/modules/speller/default/speller_impl.hpp aspell-win32/modules/speller/default/speller_impl.hpp
--- aspell-0.50.4.1/modules/speller/default/speller_impl.hpp	2002-07-26 22:27:10.000000000 -0400
+++ aspell-win32/modules/speller/default/speller_impl.hpp	2004-01-16 08:50:50.000000000 -0500
@@ -26,7 +26,13 @@
 namespace aspeller {
 
   class Language;
+#ifdef WIN32PORT
+#pragma warning( disable : 4099 )
+#endif
   class SensitiveCompare;
+#ifdef WIN32PORT
+#pragma warning( default : 4099 )
+#endif
   class Suggest;
   
   class SpellerImpl : public Speller
diff -rubw aspell-0.50.4.1/modules/speller/default/suggest.cpp aspell-win32/modules/speller/default/suggest.cpp
--- aspell-0.50.4.1/modules/speller/default/suggest.cpp	2002-07-26 22:27:10.000000000 -0400
+++ aspell-win32/modules/speller/default/suggest.cpp	2004-01-06 15:32:35.000000000 -0500
@@ -167,10 +167,17 @@
 
     BasicList<String>      strings;
 
+#ifdef WIN32PORT
+    static const bool do_count; //FB = true;
+    static const bool dont_count; //FB = false;
+    static const bool do_need_alloc;//FB = true;
+    static const bool dont_need_alloc;//FB = false;
+#else
     static const bool do_count = true;
     static const bool dont_count = false;
     static const bool do_need_alloc = true;
     static const bool dont_need_alloc = false;
+#endif
 
     void try_sound(const char *, int ms);
     void add_nearmiss(const char * word, int ms, bool count, 
@@ -279,6 +286,12 @@
     }
   }
 
+#ifdef WIN32PORT
+  const bool Working::do_count = true;
+  const bool Working::dont_count = false;
+  const bool Working::do_need_alloc = true;
+  const bool Working::dont_need_alloc = false;
+#endif
   //
   // try_others - tries to come up with possible suggestions
   //
@@ -311,7 +324,11 @@
 	new_word[i+1] = new_word[i];
 	new_word[i] = '\0';
 	
+#ifdef WIN32PORT
+  if ((bool)speller->check(new_word) && (bool)speller->check(new_word + i + 1)) { //FB uncertain
+#else
 	if (speller->check(new_word) && speller->check(new_word + i + 1)) {
+#endif
 	  new_word[i] = ' ';
 	  add_nearmiss(new_word, parms.edit_distance_weights.del2,
 		       dont_count, do_need_alloc);
@@ -637,8 +654,13 @@
 	  if (dup_pair.second && 
 	      ((pos = dup_pair.first->find(' '), pos == String::npos)
 	       ? (bool)speller->check(*dup_pair.first)
+#ifdef WIN32PORT
+	       : ((bool)speller->check((String)dup_pair.first->substr(0,pos))  //FB
+		  && (bool)speller->check((String)dup_pair.first->substr(pos+1))) )) //FB
+#else
 	       : (speller->check((String)dup_pair.first->substr(0,pos)) 
 		  && speller->check((String)dup_pair.first->substr(pos+1))) ))
+#endif
 	    near_misses_final->push_back(*dup_pair.first);
 	}
       } else {
@@ -825,7 +847,11 @@
 		l.to_normalized(key[0])) = w.extra_dis1;
       }
 
+#ifdef WIN32PORT
+      for (/*int*/ i = 0; i != c; ++i) {
+#else
       for (int i = 0; i != c; ++i) {
+#endif
 	w.repl(i,i) = 0;
 	w.extra(i,i) = w.extra_dis1;
       }
diff -rubw aspell-0.50.4.1/modules/speller/default/vector_hash-t.hpp aspell-win32/modules/speller/default/vector_hash-t.hpp
--- aspell-0.50.4.1/modules/speller/default/vector_hash-t.hpp	2002-08-11 09:58:30.000000000 -0400
+++ aspell-win32/modules/speller/default/vector_hash-t.hpp	2004-01-06 15:32:39.000000000 -0500
@@ -20,6 +20,8 @@
 
 namespace aspeller {
 
+#ifdef WIN32PORT
+#else
   template <class Parms>
   VectorHashTable<Parms>::FindIterator
   ::FindIterator(const HashTable * ht, const key_type & k)
@@ -41,6 +43,7 @@
     } while (!parms->is_nonexistent((*vector)[i])
 	     && !parms->equal(parms->key((*vector)[i]), key));
   }
+#endif
 
   template<class Parms>
   void VectorHashTable<Parms>::nonexistent_vector() {
@@ -51,7 +54,11 @@
   }
   
   template<class Parms>
+#ifdef WIN32PORT
+  std::pair< VectorHashTable<Parms>::iterator, bool>  //FB
+#else
   std::pair<typename VectorHashTable<Parms>::iterator, bool> 
+#endif
   VectorHashTable<Parms>::insert(const value_type & d) 
   {
     MutableFindIterator j(this, parms_.key(d));
@@ -167,8 +174,13 @@
     }
     VectorHashTable temp(i,parms_);
     iterator e = end();
+#ifdef WIN32PORT
+    for (iterator i2 = begin(); i2 != e; ++i2) //FB
+      temp.insert(*i2); //FB
+#else
     for (iterator i = begin(); i != e; ++i)
       temp.insert(*i);
+#endif
     swap(temp);
   }
 
diff -rubw aspell-0.50.4.1/modules/speller/default/vector_hash.hpp aspell-win32/modules/speller/default/vector_hash.hpp
--- aspell-0.50.4.1/modules/speller/default/vector_hash.hpp	2001-11-29 22:55:48.000000000 -0500
+++ aspell-win32/modules/speller/default/vector_hash.hpp	2004-01-06 15:32:53.000000000 -0500
@@ -13,6 +13,11 @@
 #ifndef __aspeller_vector_hash_hh__
 #define __aspeller_vector_hash_hh__
 
+#ifdef WIN32PORT
+# pragma warning(disable:4786)
+#include "aspellroot.h"
+#endif
+
 #include <iterator>
 #include <utility>
 
@@ -44,11 +49,25 @@
   class VHTIterator 
   {
     template <class T>
+#ifdef WIN32PORT
+    bool operator== (VHTIterator<T> rhs)
+    {
+      return pos == rhs.pos;
+    }
+#else
     friend bool operator== (VHTIterator<T>, VHTIterator<T>);
+#endif
 #ifndef REL_OPS_POLLUTION
     template <class T>
+#ifdef WIN32PORT
+    bool operator!= (VHTIterator<T> rhs)
+    {
+      return pos != rhs.pos;
+    }
+#else
     friend bool operator!= (VHTIterator<T>, VHTIterator<T>);
 #endif
+#endif
   public: //but don't use
     typedef typename Parms::TableIter       TableIter;
     typedef typename Parms::HashTable       HashTable;
@@ -57,9 +76,12 @@
   public:
     typedef std::bidirectional_iterator_tag             iterator_category;
     typedef typename Parms::Value                       value_type;
+#ifdef WIN32PORT
+#else
     typedef typename std::iterator_traits<TableIter>::difference_type difference_type;
     typedef typename std::iterator_traits<TableIter>::pointer         pointer;
     typedef typename std::iterator_traits<TableIter>::reference       reference;
+#endif
 
     //VHTIterator vector_iterator() const {return pos;}
   public:
@@ -108,21 +130,27 @@
     }
   };
 
+#ifdef WIN32PORT
+#else
   template <class Parms>
   inline 
   bool operator== (VHTIterator<Parms> rhs, VHTIterator<Parms> lhs)
   {
     return rhs.pos == lhs.pos;
   }
+#endif
 
 #ifndef REL_OPS_POLLUTION
   
+#ifdef WIN32PORT
+#else
   template <class Parms>
   inline
   bool operator!= (VHTIterator<Parms> rhs, VHTIterator<Parms> lhs)
   {
     return rhs.pos != lhs.pos;
   }
+#endif
 
 #endif
   
@@ -145,9 +173,19 @@
   //   void make_nonexistent(Value &)
 
   template <class Parms>
-  class VectorHashTable {
+  class ASPELL_API VectorHashTable {
     typedef typename Parms::Vector           Vector;
   public:
+#ifdef WIN32PORT
+    typedef typename Vector           vector_type;
+    typedef typename Parms::Vector::value_type      value_type; //FB
+    typedef typename Parms::Vector::size_type       size_type; //FB
+    typedef typename Parms::Vector::difference_type difference_type; //FB
+
+    typedef typename Parms::Vector::_Tptr         pointer; //FB
+    typedef typename Parms::Vector::reference       reference; //FB
+    typedef typename Parms::Vector::const_reference const_reference; //FB
+#else
     typedef typename Parms::Vector           vector_type;
     typedef typename Vector::value_type      value_type;
     typedef typename Vector::size_type       size_type;
@@ -156,6 +194,7 @@
     typedef typename Vector::pointer         pointer;
     typedef typename Vector::reference       reference;
     typedef typename Vector::const_reference const_reference;
+#endif
 
     typedef typename Parms::Key              key_type;
   public: // but don't use
@@ -181,8 +220,13 @@
     size_type   size_;
 
   public: // but don't use
+#ifdef WIN32PORT
+    typedef typename Parms::Vector::iterator       vector_iterator; //FB
+    typedef typename Parms::Vector::const_iterator const_vector_iterator; //FB
+#else
     typedef typename Vector::iterator       vector_iterator;
     typedef typename Vector::const_iterator const_vector_iterator;
+#endif
   
   private:
     int hash1(const key_type &d) const {
@@ -248,10 +292,32 @@
       int i;
       int hash2;
       FindIterator() {}
+#ifdef WIN32PORT
+      FindIterator(const HashTable * ht, const key_type & k) : vector(&ht->vector()) //FB
+                                                             , parms(&ht->parms())
+                                                             , key(k)
+                                                             , i(ht->hash1(k))
+                                                             , hash2(ht->hash2(k))
+      {
+        if (!parms->is_nonexistent((*vector)[i])
+	           && !parms->equal(parms->key((*vector)[i]), key))
+          adv();
+      }
+#else
       FindIterator(const HashTable * ht, const key_type & k);
+#endif
     public:
       bool at_end() const {return parms->is_nonexistent((*vector)[i]);}
+#ifdef WIN32PORT
+      void adv(){ //FB
+        do {
+          i = (i + hash2) % vector->size();
+        } while (!parms->is_nonexistent((*vector)[i])
+	        && !parms->equal(parms->key((*vector)[i]), key));
+      }
+#else
       void adv();
+#endif
       FindIterator & operator ++() {adv(); return *this;}
     };
     friend class FindIterator;
diff -rubw aspell-0.50.4.1/modules/speller/default/writable_repl.cpp aspell-win32/modules/speller/default/writable_repl.cpp
--- aspell-0.50.4.1/modules/speller/default/writable_repl.cpp	2001-11-29 22:55:48.000000000 -0500
+++ aspell-win32/modules/speller/default/writable_repl.cpp	2004-01-06 15:33:06.000000000 -0500
@@ -1,5 +1,8 @@
 // Copyright 2000 by Kevin Atkinson under the terms of the LGPL
 
+#ifdef WIN32PORT
+# pragma warning(disable:4786)
+#endif
 #include <vector>
 
 #include "data_util.hpp"
@@ -141,7 +144,13 @@
     return false;
   }
     
+#ifdef WIN32PORT
+#pragma warning (disable : 4099)
+#endif
   class WritableReplS::ElementsVirEmulImpl : public VirEnumeration<ReplacementList> {
+#ifdef WIN32PORT
+#pragma warning (default : 4099)
+#endif
   private:
     typedef LookupTable::const_iterator  OuterItr;
     typedef RealReplList::const_iterator InnerItr;
@@ -152,9 +161,17 @@
     // this assums LookupTable is non empty
     ElementsVirEmulImpl (const LookupTable & c)
       : outer_(c.begin()), end_(c.end()) 
+#ifdef WIN32PORT
+    {if (!(outer_ == end_)) inner_ = outer_->second.begin();} //FB
+#else
     {if (outer_ != end_) inner_ = outer_->second.begin();}
+#endif
 	
+#ifdef WIN32PORT
+    VirEnumeration<ReplacementList>* clone() const { //FB ?
+#else
     ElementsVirEmulImpl * clone() const {
+#endif
       return new ElementsVirEmulImpl(*this);
     }
       
@@ -171,7 +188,12 @@
       }
       ReplacementList temp
 	(inner_->misspelled_word().c_str(), 
+#ifdef WIN32PORT
+	 new MakeVirEnumeration<StrParms<RealReplacementList::const_iterator>, //FB
+       VirEnumeration<StrParms<RealReplacementList::const_iterator>::Value>  > //FB
+#else
 	 new MakeVirEnumeration<StrParms<RealReplacementList::const_iterator> >
+#endif
 	 (inner_->begin(), inner_->end()));
       ++inner_;
       return temp;
@@ -225,7 +247,12 @@
     Value deref(Iterator i) const {
       return ReplacementList
 	(i->misspelled_word().c_str(), 
+#ifdef WIN32PORT
+	 new MakeVirEnumeration<StrParms<RealReplacementList::const_iterator>,//FB
+        VirEnumeration<StrParms<RealReplacementList::const_iterator>::Value> > //FB
+#else
 	 new MakeVirEnumeration<StrParms<RealReplacementList::const_iterator> >
+#endif
 	 (i->begin(), i->end()));
     }
   };
@@ -239,7 +266,12 @@
     if (i == lookup_table->end()) {
       return new MakeAlwaysEndEnumeration<ReplacementList>();
     } else {
+#ifdef WIN32PORT
+      return new MakeVirEnumeration<ReplsWSoundslikeParms, //FB
+        VirEnumeration<ReplsWSoundslikeParms::Value> > //FB
+#else
       return new MakeVirEnumeration<ReplsWSoundslikeParms>
+#endif
 	(i->second.begin(), ReplsWSoundslikeParms(i->second.end()));
     }
   }
@@ -251,7 +283,12 @@
     const RealReplList * p = 
       reinterpret_cast<const RealReplList *>(soundslike.word_list_pointer);
 
+#ifdef WIN32PORT
+    return new MakeVirEnumeration<ReplsWSoundslikeParms, //FB
+      VirEnumeration<ReplsWSoundslikeParms::Value> >(p->begin(), p->end()); //FB
+#else
     return new MakeVirEnumeration<ReplsWSoundslikeParms>(p->begin(), p->end());
+#endif
 
   }
 
@@ -270,7 +307,12 @@
 
   WritableReplS::VirSoundslikeEmul * 
   WritableReplS::soundslike_elements() const {
+#ifdef WIN32PORT
+    return new MakeVirEnumeration<SoundslikeElementsParms, //FB
+      VirEnumeration<SoundslikeElementsParms::Value> > //FB
+#else
     return new MakeVirEnumeration<SoundslikeElementsParms>
+#endif
       (lookup_table->begin(),SoundslikeElementsParms(lookup_table->end()));
   }
 
@@ -281,7 +323,11 @@
     LookupTable::iterator i = lookup_table->begin();
     LookupTable::iterator e = lookup_table->end();
   
+#ifdef WIN32PORT
+    for (;!(i == e); ++i) { //FB
+#else
     for (;i != e; ++i) {
+#endif
       for (RealReplList::iterator j = i->second.begin(); 
 	   j != i->second.end(); 
 	   ++j) 
diff -rubw aspell-0.50.4.1/modules/speller/default/writable_ws.cpp aspell-win32/modules/speller/default/writable_ws.cpp
--- aspell-0.50.4.1/modules/speller/default/writable_ws.cpp	2001-11-29 22:55:48.000000000 -0500
+++ aspell-win32/modules/speller/default/writable_ws.cpp	2004-01-16 08:51:41.000000000 -0500
@@ -1,5 +1,8 @@
 // Copyright 2000 by Kevin Atkinson under the terms of the LGPL
 
+#ifdef WIN32PORT
+# pragma warning(disable:4786)
+#endif
 #include <vector>
 
 #include "copy_ptr-t.hpp"
@@ -92,7 +95,12 @@
 
   WritableWS::VirEmul * WritableWS::detailed_elements() const {
 
+#ifdef WIN32PORT
+    return new MakeVirEnumeration<ElementsParms, //FB
+      VirEnumeration<ElementsParms::Value> > //FB
+#else
     return new MakeVirEnumeration<ElementsParms>
+#endif
       (word_lookup->begin(),ElementsParms(word_lookup->end()));
   }
 
@@ -153,7 +161,11 @@
     
     RealSoundslikeWordList::const_iterator j;
   
+#ifdef WIN32PORT
+    for (;!(i == e); ++i) { //FB (strange)
+#else
     for (;i != e; ++i) {
+#endif
       for (j = i->second.begin(); j != i->second.end(); ++j) {
 	out << *j << '\n';
       }
@@ -185,7 +197,11 @@
   {
     pair<WordLookup::iterator, WordLookup::iterator> 
       p(word_lookup->equal_range(SimpleString(word,1)));
+#ifdef WIN32PORT
+    while (!(p.first == p.second)) { //FB
+#else
     while (p.first != p.second) {
+#endif
       if (c(word,p.first->c_str()))
 	return p.first->c_str();
       ++p.first;
@@ -212,7 +228,12 @@
     if (i == soundslike_lookup.end()) {
       return new MakeAlwaysEndEnumeration<BasicWordInfo>();
     } else {
+#ifdef WIN32PORT
+      return new MakeVirEnumeration<SoundslikeWordsParms,
+        VirEnumeration<SoundslikeWordsParms::Value> >
+#else
       return new MakeVirEnumeration<SoundslikeWordsParms>
+#endif
 	(i->second.begin(), SoundslikeWordsParms(i->second.end()));
     }
   }
@@ -232,7 +253,12 @@
     
     
   WritableWS::VirSoundslikeEmul * WritableWS::soundslike_elements() const {
+#ifdef WIN32PORT
+    return new MakeVirEnumeration<SoundslikeElementsParms,
+      VirEnumeration<SoundslikeElementsParms::Value> > //FB
+#else
     return new MakeVirEnumeration<SoundslikeElementsParms>
+#endif
       (soundslike_lookup.begin(), soundslike_lookup.end());
   }
 
@@ -243,7 +269,12 @@
       = reinterpret_cast<const RealSoundslikeWordList *>
       (word.word_list_pointer);
       
+#ifdef WIN32PORT
+    return new MakeVirEnumeration<SoundslikeWordsParms, //FB
+      VirEnumeration<SoundslikeWordsParms::Value> > //FB
+#else
     return new MakeVirEnumeration<SoundslikeWordsParms>
+#endif
       (temp->begin(), SoundslikeWordsParms(temp->end()));
   }
 
diff -rubw aspell-0.50.4.1/prog/aspell.cpp aspell-win32/prog/aspell.cpp
--- aspell-0.50.4.1/prog/aspell.cpp	2003-10-06 23:45:24.000000000 -0400
+++ aspell-win32/prog/aspell.cpp	2004-01-06 15:33:21.000000000 -0500
@@ -65,22 +65,49 @@
   do{PosibErrBase pe(command);\
   if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; exit(1);}\
   } while(false)
+#ifdef WIN32PORT
+#define EXIT_ON_ERR_SET(command, type, var)\
+  typedef type temp_t;\
+  temp_t var;\
+  do{PosibErr<temp_t> pe(command);\
+  if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; exit(1);}\
+  else {var=pe.data;}\
+  } while(false)
+#else
 #define EXIT_ON_ERR_SET(command, type, var)\
   type var;\
   do{PosibErr<type> pe(command);\
   if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; exit(1);}\
   else {var=pe.data;}\
   } while(false)
+#endif
+#define EXIT_ON_ERR_SET(command, type, var)\
+  typedef type temp_t;\
+  temp_t var;\
+  do{PosibErr<temp_t> pe(command);\
+  if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; exit(1);}\
+  else {var=pe.data;}\
+  } while(false)
 #define BREAK_ON_ERR(command) \
   do{PosibErrBase pe(command);\
   if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; break;}\
   } while(false)
+#ifdef WIN32PORT
+#define BREAK_ON_ERR_SET(command, type, var)\
+  typedef type temp_t;\
+  temp_t var;\
+  do{PosibErr<temp_t> pe(command);\
+  if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; break;}\
+  else {var=pe.data;}\
+  } while(false)
+#else
 #define BREAK_ON_ERR_SET(command, type, var)\
   type var;\
   do{PosibErr<type> pe(command);\
   if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; break;}\
   else {var=pe.data;}\
   } while(false)
+#endif
 
 
 /////////////////////////////////////////////////////////
@@ -183,7 +210,11 @@
   return i;
 }
 
+#ifdef WIN32PORT
+int cmdline_main (int argc, char *argv[]) 
+#else
 int main (int argc, const char *argv[]) 
+#endif
 {
   EXIT_ON_ERR(options->read_in_settings());
 
@@ -283,7 +314,15 @@
   //
   // perform the requisted action
   //
+#ifdef WIN32PORT
+	// Evidently, the assignment somehow references memory that isn't available
+	// when the destructor for the String is called.  This change makes sure that
+	// the string gets its own copy of the data. -- TL
+  String action_str;
+  action_str.append(args.front());
+#else
   String action_str = args.front();
+#endif
   args.pop_front();
   if (action_str == "help")
     print_help();
@@ -319,7 +358,15 @@
       CERR << "Error: Unknown Action: " << action_str << "\n";
       return 1;
     }
+#ifdef WIN32PORT
+	// Evidently, the assignment somehow references memory that isn't available
+	// when the destructor for the String is called.  This change makes sure that
+	// the string gets its own copy of the data. -- TL
+    String what_str;
+	what_str.append(args.front());
+#else
     String what_str = args.front();
+#endif
     args.pop_front();
     if (what_str == "config")
       config();
@@ -1004,7 +1051,11 @@
   String data;
 public:
   IstreamVirEnumeration(FStream & i) : in(&i) {}
+#ifdef WIN32PORT
+  StringEnumeration * clone() const {
+#else
   IstreamVirEnumeration * clone() const {
+#endif
     return new IstreamVirEnumeration(*this);
   }
   void assign (const StringEnumeration * other) {
diff -rubw aspell-0.50.4.1/prog/checker_string.cpp aspell-win32/prog/checker_string.cpp
--- aspell-0.50.4.1/prog/checker_string.cpp	2003-06-05 14:35:02.000000000 -0400
+++ aspell-win32/prog/checker_string.cpp	2004-01-06 15:33:24.000000000 -0500
@@ -93,7 +93,11 @@
 	correct = true;
     }
     if (!correct)
+#ifdef WIN32PORT
+      correct = aspell_speller_check(speller_, &*word_begin_, word_size_) != 0;
+#else
       correct = aspell_speller_check(speller_, &*word_begin_, word_size_);
+#endif
     diff_ += word_size_ - tok_.len;
     tok_.len = word_size_;
     if (!correct)
diff -rubw aspell-0.50.4.1/prog/compress.c aspell-win32/prog/compress.c
--- aspell-0.50.4.1/prog/compress.c	2002-08-31 15:51:12.000000000 -0400
+++ aspell-win32/prog/compress.c	2004-01-06 15:33:27.000000000 -0500
@@ -52,7 +52,11 @@
   else return 1;
 }
 
+#if WIN32PORT
+int compress_main (int argc, char *argv[]) {
+#else
 int main (int argc, const char *argv[]) {
+#endif
 
   if (argc != 2) {
 
Only in aspell-win32: settings.h