Commit 90d9964ec9c6537a69dedbc29f0a6d277707dbcc
2000-12-09T00:45:38
* */*.h: Changed body inclusion macro names to start and end with `__' (those which haven't converted yet). Fixed minor conversion issues. * src/winfonts/winfnt.c: Updated to new header inclusion scheme. * */*.[ch]: Changed source files to adhere to the new * src/cff/cff.c, src/cff/rules.mk: Updated. * */*.[ch]: Now using <ft2build.h> as the default build and setup
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
diff --git a/ChangeLog b/ChangeLog
index 7541852..f428464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+2000-12-08 Werner Lemberg <wl@gnu.org>
+
+ * */*.h: Changed body inclusion macro names to start and end with
+ `__' (those which haven't converted yet). Fixed minor conversion
+ issues.
+
+ * src/winfonts/winfnt.c: Updated to new header inclusion scheme.
+
2000-12-07 David Turner <david.turner@freetype.org>
- * many files: Changed source files to adhere to the new
+ * */*.[ch]: Changed source files to adhere to the new
header inclusion scheme. Not completely tested but works for now
here.
@@ -23,6 +31,8 @@
* src/cff/t2tokens.h: Renamed and updated to...
* src/cff/cfftoken.h: New file.
+ * src/cff/cff.c, src/cff/rules.mk: Updated.
+
2000-12-06 David Turner <david.turner@freetype.org>
* src/cache/ftlru.c (FT_Lru_Done): Fixed memory leak.
@@ -58,7 +68,7 @@
is now installed as <ft2build.h> for Unix systems. Note that we
still use the "freetype2/freetype" installation path for now.
- * many files: Now using <ft2build.h> as the default build and setup
+ * */*.[ch]: Now using <ft2build.h> as the default build and setup
configuration file in all public headers. Internal source files
still need some changes though.
diff --git a/include/freetype/cache/ftcchunk.h b/include/freetype/cache/ftcchunk.h
index 99c3431..145c8bc 100644
--- a/include/freetype/cache/ftcchunk.h
+++ b/include/freetype/cache/ftcchunk.h
@@ -45,10 +45,12 @@
#ifndef __FTCCHUNK_H__
#define __FTCCHUNK_H__
+
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_MANAGER_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h
index ae4d4c1..93aac63 100644
--- a/include/freetype/cache/ftcglyph.h
+++ b/include/freetype/cache/ftcglyph.h
@@ -53,10 +53,13 @@
#ifndef __FTCGLYPH_H__
#define __FTCGLYPH_H__
-#include <ft2build.h>
-#include FT_CACHE_H
-#include FT_CACHE_MANAGER_H
-#include <stddef.h>
+
+#include <ft2build.h>
+#include FT_CACHE_H
+#include FT_CACHE_MANAGER_H
+
+#include <stddef.h>
+
FT_BEGIN_HEADER
@@ -198,6 +201,7 @@ FT_BEGIN_HEADER
FT_UInt gindex,
FTC_GlyphNode *anode );
+
FT_END_HEADER
#endif /* __FTCGLYPH_H__ */
diff --git a/include/freetype/cache/ftcimage.h b/include/freetype/cache/ftcimage.h
index 2564daf..e8a25bb 100644
--- a/include/freetype/cache/ftcimage.h
+++ b/include/freetype/cache/ftcimage.h
@@ -1,6 +1,6 @@
/***************************************************************************/
/* */
-/* ftcimage.c */
+/* ftcimage.h */
/* */
/* FreeType Image cache (body). */
/* */
@@ -26,9 +26,11 @@
#ifndef __FTCIMAGE_H__
#define __FTCIMAGE_H__
-#include <ft2build.h>
-#include FT_CACHE_H
-#include FT_CACHE_INTERNAL_GLYPH_H
+
+#include <ft2build.h>
+#include FT_CACHE_H
+#include FT_CACHE_INTERNAL_GLYPH_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/cache/ftcmanag.h b/include/freetype/cache/ftcmanag.h
index 1e33c85..72794da 100644
--- a/include/freetype/cache/ftcmanag.h
+++ b/include/freetype/cache/ftcmanag.h
@@ -62,12 +62,15 @@
#ifndef __FTCMANAG_H__
#define __FTCMANAG_H__
-#include <ft2build.h>
-#include FT_CACHE_H
-#include FT_CACHE_INTERNAL_LRU_H
+
+#include <ft2build.h>
+#include FT_CACHE_H
+#include FT_CACHE_INTERNAL_LRU_H
+
FT_BEGIN_HEADER
+
#define FTC_MAX_FACES_DEFAULT 2
#define FTC_MAX_SIZES_DEFAULT 4
#define FTC_MAX_BYTES_DEFAULT 200000 /* 200kByte by default! */
@@ -359,6 +362,7 @@ FT_BEGIN_HEADER
/* */
+
FT_END_HEADER
#endif /* __FTCMANAG_H__ */
diff --git a/include/freetype/cache/ftcsbits.h b/include/freetype/cache/ftcsbits.h
index 95bbde2..6de4ed4 100644
--- a/include/freetype/cache/ftcsbits.h
+++ b/include/freetype/cache/ftcsbits.h
@@ -19,10 +19,13 @@
#ifndef __FTCSBITS_H__
#define __FTCSBITS_H__
-#include <ft2build.h>
-#include FT_CACHE_H
-#include FT_CACHE_INTERNAL_CHUNK_H
-#include FT_CACHE_IMAGE_H
+
+#include <ft2build.h>
+#include FT_CACHE_H
+#include FT_CACHE_INTERNAL_CHUNK_H
+#include FT_CACHE_IMAGE_H
+
+
FT_BEGIN_HEADER
@@ -57,6 +60,7 @@ FT_BEGIN_HEADER
FTC_Image_Desc* desc,
FT_UInt gindex,
FTC_SBit *sbit );
+
FT_END_HEADER
#endif /* __FTCSBITS_H__ */
diff --git a/include/freetype/cache/ftlru.h b/include/freetype/cache/ftlru.h
index 16814c8..a7d0587 100644
--- a/include/freetype/cache/ftlru.h
+++ b/include/freetype/cache/ftlru.h
@@ -58,8 +58,10 @@
#ifndef __FTLRU_H__
#define __FTLRU_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
@@ -162,6 +164,7 @@ FT_BEGIN_HEADER
FT_Lru_Selector selector,
FT_Pointer data );
+
FT_END_HEADER
#endif /* __FTLRU_H__ */
diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h
index d0ae604..946e7e3 100644
--- a/include/freetype/config/ft2build.h
+++ b/include/freetype/config/ft2build.h
@@ -13,28 +13,30 @@
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
/* */
-/* */
-/* This file corresponds to the default "ft2build.h" file for */
-/* FreeType 2. It uses the "freetype" include root. */
-/* */
-/* Note that specific platforms might use a different configurations. */
-/* For example, on Unix, the "freetype2" include root is used, with */
-/* a specific "ft2build.h" used to take care of this. The latter */
-/* looks like the following: */
-/* */
-/* */
-/* #ifndef __FT_BUILD_UNIX_H__ */
-/* #define __FT_BUILD_UNIX_H__ */
-/* */
-/* #define FT2_ROOT freetype2 */
-/* #include <FT2_ROOT/config/ft2build.h> */
-/* */
-/* #endif // __FT_BUILD_UNIX_H__ */
-/* */
-/* */
/***************************************************************************/
+ /*************************************************************************/
+ /* */
+ /* This file corresponds to the default "ft2build.h" file for */
+ /* FreeType 2. It uses the "freetype" include root. */
+ /* */
+ /* Note that specific platforms might use a different configurations. */
+ /* For example, on Unix, the "freetype2" include root is used, with a */
+ /* specific "ft2build.h" used to take care of this. The latter looks */
+ /* like the following: */
+ /* */
+ /* #ifndef __FT_BUILD_UNIX_H__ */
+ /* #define __FT_BUILD_UNIX_H__ */
+ /* */
+ /* #define FT2_ROOT freetype2 */
+ /* #include <FT2_ROOT/config/ft2build.h> */
+ /* */
+ /* #endif // __FT_BUILD_UNIX_H__ */
+ /* */
+ /*************************************************************************/
+
+
#ifndef __FT2_BUILD_H__
#define __FT2_BUILD_H__
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index 0c8217f..49e90f8 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -39,11 +39,13 @@
#ifndef __FTCONFIG_H__
#define __FTCONFIG_H__
-#include <ft2build.h>
-#include FT_CONFIG_OPTIONS_H
+#include <ft2build.h>
+#include FT_CONFIG_OPTIONS_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* PLATFORM-SPECIFIC CONFIGURATION MACROS */
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 032c842..76d8875 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -16,13 +16,14 @@
/***************************************************************************/
-#ifndef FTOPTION_H
-#define FTOPTION_H
+#ifndef __FTOPTION_H__
+#define __FTOPTION_H__
-#ifdef __cplusplus
- extern "C" {
-#endif
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
/*************************************************************************/
@@ -389,12 +390,10 @@
#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
-#ifdef __cplusplus
- }
-#endif
+FT_END_HEADER
-#endif /* FTOPTION_H */
+#endif /* __FTOPTION_H__ */
/* END */
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index d7240e2..e9d1c44 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -19,6 +19,7 @@
#ifndef __FREETYPE_H__
#define __FREETYPE_H__
+
/*************************************************************************/
/* */
/* The `raster' component duplicates some of the declarations in */
@@ -42,8 +43,10 @@
#include FT_ERRORS_H
#include FT_TYPES_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/*************************************************************************/
/* */
@@ -2283,6 +2286,7 @@ FT_BEGIN_HEADER
/* */
+
FT_END_HEADER
#endif /* __FREETYPE_H__ */
diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h
index d2de225..7cf149c 100644
--- a/include/freetype/ftbbox.h
+++ b/include/freetype/ftbbox.h
@@ -30,11 +30,14 @@
#ifndef FTBBOX_H
#define FTBBOX_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* <Function> */
@@ -62,6 +65,7 @@ FT_BEGIN_HEADER
/* */
+
FT_END_HEADER
#endif /* FTBBOX_H */
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index eacaa38..efac5ee 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -34,11 +34,14 @@
#ifndef __FTCACHE_H__
#define __FTCACHE_H__
-#include <ft2build.h>
-#include FT_GLYPH_H
+
+#include <ft2build.h>
+#include FT_GLYPH_H
+
FT_BEGIN_HEADER
+
#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)
diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h
index 8764b01..5db4509 100644
--- a/include/freetype/fterrors.h
+++ b/include/freetype/fterrors.h
@@ -23,7 +23,7 @@
/* something like */
/* */
/* { */
- /* #undef FTERRORS_H */
+ /* #undef __FTERRORS_H__ */
/* #define FT_ERRORDEF( e, v, s ) { e, s }, */
/* #define FT_ERROR_START_LIST { */
/* #define FT_ERROR_END_LIST { 0, 0 } }; */
@@ -34,7 +34,7 @@
/* const char* err_msg */
/* } ft_errors[] = */
/* */
- /* #include <freetype/fterrors.h> */
+ /* #include FT_ERRORS_H */
/* } */
/* */
/* For C++ it might be necessary to use `extern "C" {' and to define */
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index dbe6274..6f2349e 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -32,8 +32,10 @@
#ifndef __FTGLYPH_H__
#define __FTGLYPH_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index f1e4e7d..5d2d029 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -30,6 +30,7 @@
#include <ft2build.h>
+
FT_BEGIN_HEADER
@@ -994,7 +995,6 @@ FT_BEGIN_HEADER
FT_END_HEADER
-
#endif /* __FTIMAGE_H__ */
diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h
index 895aa10..a3d60a3 100644
--- a/include/freetype/ftlist.h
+++ b/include/freetype/ftlist.h
@@ -1,6 +1,6 @@
/***************************************************************************/
/* */
-/* ftlist.c */
+/* ftlist.h */
/* */
/* Generic list support for FreeType (specification). */
/* */
@@ -27,8 +27,10 @@
#ifndef __FTLIST_H__
#define __FTLIST_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
@@ -216,4 +218,5 @@ FT_END_HEADER
#endif /* __FTLIST_H__ */
+
/* END */
diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h
index a036c55..a258a04 100644
--- a/include/freetype/ftmac.h
+++ b/include/freetype/ftmac.h
@@ -29,9 +29,10 @@
#define __FT_MAC_H__
-#ifdef __cplusplus
- extern "C" {
-#endif
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
/*************************************************************************/
@@ -70,9 +71,7 @@
FT_Face *aface );
-#ifdef __cplusplus
- }
-#endif
+FT_END_HEADER
#endif /* __FT_MAC_H__ */
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
index 9269634..719fe65 100644
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -19,11 +19,14 @@
#ifndef __FTMM_H__
#define __FTMM_H__
-#include <ft2build.h>
-#include FT_TYPE1_TABLES_H
+
+#include <ft2build.h>
+#include FT_TYPE1_TABLES_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* <Struct> */
diff --git a/include/freetype/ftmodule.h b/include/freetype/ftmodule.h
index 4afbf68..06eca04 100644
--- a/include/freetype/ftmodule.h
+++ b/include/freetype/ftmodule.h
@@ -19,11 +19,14 @@
#ifndef __FTMODULE_H__
#define __FTMODULE_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
+
/* module bit flags */
typedef enum FT_Module_Flags_
{
diff --git a/include/freetype/ftnames.h b/include/freetype/ftnames.h
index bb1e903..069ea3f 100644
--- a/include/freetype/ftnames.h
+++ b/include/freetype/ftnames.h
@@ -22,8 +22,10 @@
#ifndef __FTNAMES_H__
#define __FTNAMES_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 2894fc0..258f472 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -20,8 +20,10 @@
#ifndef __FTOUTLN_H__
#define __FTOUTLN_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
@@ -313,6 +315,7 @@ FT_BEGIN_HEADER
FT_Outline* outline,
FT_Raster_Params* params );
+
FT_END_HEADER
#endif /* __FTOUTLN_H__ */
diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h
index 73be242..c807705 100644
--- a/include/freetype/ftrender.h
+++ b/include/freetype/ftrender.h
@@ -19,9 +19,11 @@
#ifndef __FTRENDER_H__
#define __FTRENDER_H__
-#include <ft2build.h>
-#include FT_MODULE_H
-#include FT_GLYPH_H
+
+#include <ft2build.h>
+#include FT_MODULE_H
+#include FT_GLYPH_H
+
FT_BEGIN_HEADER
@@ -180,6 +182,7 @@ FT_BEGIN_HEADER
/* */
+
FT_END_HEADER
#endif /* __FTRENDER_H__ */
diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h
index 42b1e26..9024319 100644
--- a/include/freetype/ftsynth.h
+++ b/include/freetype/ftsynth.h
@@ -37,11 +37,14 @@
#ifndef __FTSYNTH_H__
#define __FTSYNTH_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
+
/* This code is completely experimental -- use with care! */
/* It will probably be completely rewritten in the future */
/* or even integrated into the library. */
@@ -53,8 +56,8 @@ FT_BEGIN_HEADER
FT_Outline* outline,
FT_Pos* advance );
-FT_END_HEADER
+FT_END_HEADER
#endif /* __FTSYNTH_H__ */
diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h
index 7620bd6..1a963d9 100644
--- a/include/freetype/ftsystem.h
+++ b/include/freetype/ftsystem.h
@@ -16,13 +16,14 @@
/***************************************************************************/
-#ifndef FTSYSTEM_H
-#define FTSYSTEM_H
+#ifndef __FTSYSTEM_H__
+#define __FTSYSTEM_H__
-#ifdef __cplusplus
- extern "C" {
-#endif
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
/*************************************************************************/
@@ -100,12 +101,9 @@
};
-#ifdef __cplusplus
- }
-#endif
-
+FT_END_HEADER
-#endif /* FTSYSTEM_H */
+#endif /* __FTSYSTEM_H__ */
/* END */
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 1460c7c..962a723 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -19,13 +19,16 @@
#ifndef __FTTYPES_H__
#define __FTTYPES_H__
-#include <ft2build.h>
-#include FT_SYSTEM_H
-#include FT_IMAGE_H
-#include <stddef.h>
+
+#include <ft2build.h>
+#include FT_SYSTEM_H
+#include FT_IMAGE_H
+#include <stddef.h>
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* <Type> */
@@ -396,6 +399,7 @@ FT_BEGIN_HEADER
#define FT_IS_EMPTY( list ) ( (list).head == 0 )
+
FT_END_HEADER
#endif /* __FTTYPES_H__ */
diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h
index 719ee13..cbfc185 100644
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -69,11 +69,14 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
+
typedef struct FT_AutoHinterRec_ *FT_AutoHinter;
diff --git a/include/freetype/internal/fnttypes.h b/include/freetype/internal/fnttypes.h
index 1297672..080770d 100644
--- a/include/freetype/internal/fnttypes.h
+++ b/include/freetype/internal/fnttypes.h
@@ -20,8 +20,10 @@
#ifndef __FNTTYPES_H__
#define __FNTTYPES_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index 5637fb1..14f2f61 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -19,8 +19,10 @@
#ifndef __FTCALC_H__
#define __FTCALC_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
@@ -214,6 +216,7 @@ FT_BEGIN_HEADER
#define ROUND_F26DOT6( x ) ( x >= 0 ? ( ( (x) + 32 ) & -64 ) \
: ( -( ( 32 - (x) ) & -64 ) ) )
+
FT_END_HEADER
#endif /* __FTCALC_H__ */
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index 981775d..0ab4c33 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -19,11 +19,14 @@
#ifndef __FTDEBUG_H__
#define __FTDEBUG_H__
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
+
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+
FT_BEGIN_HEADER
+
#ifdef FT_DEBUG_LEVEL_TRACE
diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h
index 746ded6..2cd51ce 100644
--- a/include/freetype/internal/ftdriver.h
+++ b/include/freetype/internal/ftdriver.h
@@ -19,8 +19,10 @@
#ifndef __FTDRIVER_H__
#define __FTDRIVER_H__
-#include <ft2build.h>
-#include FT_MODULE_H
+
+#include <ft2build.h>
+#include FT_MODULE_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/ftextend.h b/include/freetype/internal/ftextend.h
index a386aa2..05ef864 100644
--- a/include/freetype/internal/ftextend.h
+++ b/include/freetype/internal/ftextend.h
@@ -19,11 +19,14 @@
#ifndef __FTEXTEND_H__
#define __FTEXTEND_H__
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* The extensions don't need to be integrated at compile time into the */
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index 304e390..27b572f 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -19,12 +19,15 @@
#ifndef __FTMEMORY_H__
#define __FTMEMORY_H__
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_TYPES_H
+
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+#include FT_TYPES_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* <Macro> */
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index db7893f..f295330 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -26,14 +26,17 @@
#ifndef __FTOBJS_H__
#define __FTOBJS_H__
+
#include <ft2build.h>
#include FT_RENDER_H
#include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_DRIVER_H
#include FT_INTERNAL_AUTOHINT_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* Some generic definitions. */
diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h
index 44c26e3..93b9868 100644
--- a/include/freetype/internal/ftstream.h
+++ b/include/freetype/internal/ftstream.h
@@ -19,8 +19,10 @@
#ifndef __FTSTREAM_H__
#define __FTSTREAM_H__
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/internal.h b/include/freetype/internal/internal.h
index 9895ea2..f0c20b6 100644
--- a/include/freetype/internal/internal.h
+++ b/include/freetype/internal/internal.h
@@ -24,7 +24,7 @@
/*************************************************************************/
- /* don't add spaces around the argument of FT_INTERNAL_FILE! */
+ /* don't add spaces around the argument of FT2_INTERNAL_FILE! */
#define FT_INTERNAL_OBJECTS_H FT2_INTERNAL_FILE(ftobjs.h)
#define FT_INTERNAL_STREAM_H FT2_INTERNAL_FILE(ftstream.h)
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index a41acda..4696ae2 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -20,9 +20,11 @@
#ifndef __PSAUX_H__
#define __PSAUX_H__
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_TYPE1_TYPES_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_TYPE1_TYPES_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/psnames.h b/include/freetype/internal/psnames.h
index 7587bca..0e3157f 100644
--- a/include/freetype/internal/psnames.h
+++ b/include/freetype/internal/psnames.h
@@ -20,11 +20,14 @@
#ifndef __PSNAMES_H__
#define __PSNAMES_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* <FuncType> */
diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h
index 17db466..9263a5b 100644
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -19,12 +19,15 @@
#ifndef __SFNT_H__
#define __SFNT_H__
-#include <ft2build.h>
-#include FT_INTERNAL_DRIVER_H
-#include FT_INTERNAL_TRUETYPE_TYPES_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_DRIVER_H
+#include FT_INTERNAL_TRUETYPE_TYPES_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* <FuncType> */
diff --git a/include/freetype/internal/t1errors.h b/include/freetype/internal/t1errors.h
index 79fdf69..7bb951f 100644
--- a/include/freetype/internal/t1errors.h
+++ b/include/freetype/internal/t1errors.h
@@ -20,9 +20,10 @@
#define __T1ERRORS_H__
-#ifdef __cplusplus
- extern "C" {
-#endif
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
/************************ error codes declaration **************/
@@ -66,10 +67,7 @@
#define T1_Err_Stack_Overflow FT_Err_Invalid_File_Format
-#ifdef __cplusplus
- }
-#endif
-
+FT_END_HEADER
#endif /* __T1ERRORS_H__ */
diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h
index 9110be8..01841f0 100644
--- a/include/freetype/internal/t1types.h
+++ b/include/freetype/internal/t1types.h
@@ -20,9 +20,11 @@
#ifndef __T1TYPES_H__
#define __T1TYPES_H__
-#include <ft2build.h>
-#include FT_TYPE1_TABLES_H
-#include FT_INTERNAL_POSTSCRIPT_NAMES_H
+
+#include<ft2build.h>
+#include FT_TYPE1_TABLES_H
+#include FT_INTERNAL_POSTSCRIPT_NAMES_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/t2errors.h b/include/freetype/internal/t2errors.h
index 7a3d397..eac47b2 100644
--- a/include/freetype/internal/t2errors.h
+++ b/include/freetype/internal/t2errors.h
@@ -20,9 +20,10 @@
#define __T2ERRORS_H__
-#ifdef __cplusplus
- extern "C" {
-#endif
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
/*************************************************************************/
@@ -120,9 +121,7 @@
#define T2_Err_Could_Not_Find_Context 0x550
-#ifdef __cplusplus
- }
-#endif
+FT_END_HEADER
#endif /* __T2ERRORS_H__ */
diff --git a/include/freetype/internal/t2types.h b/include/freetype/internal/t2types.h
index ab6940d..dae7722 100644
--- a/include/freetype/internal/t2types.h
+++ b/include/freetype/internal/t2types.h
@@ -20,8 +20,10 @@
#ifndef __T2TYPES_H__
#define __T2TYPES_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/tterrors.h b/include/freetype/internal/tterrors.h
index 3f6c334..e235d81 100644
--- a/include/freetype/internal/tterrors.h
+++ b/include/freetype/internal/tterrors.h
@@ -20,9 +20,10 @@
#define __TTERRORS_H__
-#ifdef __cplusplus
- extern "C" {
-#endif
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
/*************************************************************************/
@@ -120,9 +121,7 @@
#define TT_Err_Could_Not_Find_Context 0x450
-#ifdef __cplusplus
- }
-#endif
+FT_END_HEADER
#endif /* __TTERRORS_H__ */
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 0ca53b9..095311a 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -20,9 +20,11 @@
#ifndef __TTTYPES_H__
#define __TTTYPES_H__
-#include <ft2build.h>
-#include FT_TRUETYPE_TABLES_H
-#include FT_INTERNAL_OBJECTS_H
+
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
+#include FT_INTERNAL_OBJECTS_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/t1tables.h b/include/freetype/t1tables.h
index dc5edc9..1091e88 100644
--- a/include/freetype/t1tables.h
+++ b/include/freetype/t1tables.h
@@ -20,11 +20,14 @@
#ifndef __T1TABLES_H__
#define __T1TABLES_H__
+
#include <ft2build.h>
#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
+
/* Note that we separate font data in T1_FontInfo and T1_Private */
/* structures in order to support Multiple Master fonts. */
diff --git a/include/freetype/ttnameid.h b/include/freetype/ttnameid.h
index fcb1d96..293b033 100644
--- a/include/freetype/ttnameid.h
+++ b/include/freetype/ttnameid.h
@@ -20,9 +20,10 @@
#define __TTNAMEID_H__
-#ifdef __cplusplus
- extern "C" {
-#endif
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
/*************************************************************************/
@@ -713,10 +714,7 @@
#endif /* !HAVE_LIMIT_ON_IDENTS */
-#ifdef __cplusplus
- }
-#endif
-
+FT_END_HEADER
#endif /* __TTNAMEID_H__ */
diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h
index d5724ef..dbbcc16 100644
--- a/include/freetype/tttables.h
+++ b/include/freetype/tttables.h
@@ -20,11 +20,14 @@
#ifndef __TTTABLES_H__
#define __TTTABLES_H__
+
#include <ft2build.h>
#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
+
/*************************************************************************/
/* */
/* <Struct> */
diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h
index 56a6a91..4259c21 100644
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -19,11 +19,14 @@
#ifndef __TTAGS_H__
#define __TTAGS_H__
+
#include <ft2build.h>
#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
+
#define TTAG_cmap FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
#define TTAG_cvt FT_MAKE_TAG( 'c', 'v', 't', ' ' )
#define TTAG_CFF FT_MAKE_TAG( 'C', 'F', 'F', ' ' )
@@ -62,6 +65,7 @@ FT_BEGIN_HEADER
#define TTAG_vhea FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
#define TTAG_vmtx FT_MAKE_TAG( 'v', 'm', 't', 'x' )
+
FT_END_HEADER
#endif /* __TTAGS_H__ */
diff --git a/src/autohint/ahangles.c b/src/autohint/ahangles.c
index ff70f43..7187852 100644
--- a/src/autohint/ahangles.c
+++ b/src/autohint/ahangles.c
@@ -19,6 +19,7 @@
/* */
/***************************************************************************/
+
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahangles.h)
diff --git a/src/autohint/ahangles.h b/src/autohint/ahangles.h
index 4012614..30f9886 100644
--- a/src/autohint/ahangles.h
+++ b/src/autohint/ahangles.h
@@ -23,12 +23,15 @@
#ifndef __AHANGLES_H__
#define __AHANGLES_H__
+
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE(autohint,ahtypes.h)
+
FT_BEGIN_HEADER
+
/* PI expressed in ah_angles -- we don't really need an important */
/* precision, so 256 should be enough */
#define AH_PI 256
diff --git a/src/autohint/ahglobal.c b/src/autohint/ahglobal.c
index d35cc4d..63aab22 100644
--- a/src/autohint/ahglobal.c
+++ b/src/autohint/ahglobal.c
@@ -18,6 +18,7 @@
/* */
/***************************************************************************/
+
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahglobal.h)
#include FT_SOURCE_FILE(autohint,ahglyph.h)
diff --git a/src/autohint/ahglobal.h b/src/autohint/ahglobal.h
index 42306b4..f63462d 100644
--- a/src/autohint/ahglobal.h
+++ b/src/autohint/ahglobal.h
@@ -23,10 +23,12 @@
#ifndef __AHGLOBAL_H__
#define __AHGLOBAL_H__
+
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahtypes.h)
#include FT_INTERNAL_OBJECTS_H
+
FT_BEGIN_HEADER
diff --git a/src/autohint/ahglyph.h b/src/autohint/ahglyph.h
index cd3c34e..4a19104 100644
--- a/src/autohint/ahglyph.h
+++ b/src/autohint/ahglyph.h
@@ -20,8 +20,8 @@
/***************************************************************************/
-#ifndef AHGLYPH_H
-#define AHGLYPH_H
+#ifndef __AHGLYPH_H__
+#define __AHGLYPH_H__
#include <ft2build.h>
@@ -86,7 +86,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* AHGLYPH_H */
+#endif /* __AHGLYPH_H__ */
/* END */
diff --git a/src/autohint/ahhint.h b/src/autohint/ahhint.h
index 2b9876c..777155b 100644
--- a/src/autohint/ahhint.h
+++ b/src/autohint/ahhint.h
@@ -19,8 +19,8 @@
/***************************************************************************/
-#ifndef AHHINT_H
-#define AHHINT_H
+#ifndef __AHHINT_H__
+#define __AHHINT_H__
#include <ft2build.h>
@@ -29,6 +29,7 @@
FT_BEGIN_HEADER
+
#define AH_HINT_DEFAULT 0
#define AH_HINT_NO_ALIGNMENT 1
#define AH_HINT_NO_HORZ_EDGES 0x20000L
@@ -65,9 +66,10 @@ FT_BEGIN_HEADER
void ah_hinter_done_global_hints( AH_Hinter* hinter,
void* global_hints );
+
FT_END_HEADER
-#endif /* AHHINT_H */
+#endif /* __AHHINT_H__ */
/* END */
diff --git a/src/autohint/ahloader.h b/src/autohint/ahloader.h
index a03a87c..aea60c3 100644
--- a/src/autohint/ahloader.h
+++ b/src/autohint/ahloader.h
@@ -32,13 +32,16 @@
/*************************************************************************/
-#ifndef AHLOADER_H
-#define AHLOADER_H
+#ifndef __AHLOADER_H__
+#define __AHLOADER_H__
+
#include <ft2build.h>
+
FT_BEGIN_HEADER
+
#ifdef _STANDALONE_
typedef struct AH_GlyphLoad_
@@ -121,9 +124,10 @@ FT_BEGIN_HEADER
#endif /* _STANDALONE_ */
+
FT_END_HEADER
-#endif /* AHLOADER_H */
+#endif /* __AHLOADER_H__ */
/* END */
diff --git a/src/autohint/ahmodule.h b/src/autohint/ahmodule.h
index 0789c64..ce8daa1 100644
--- a/src/autohint/ahmodule.h
+++ b/src/autohint/ahmodule.h
@@ -19,20 +19,24 @@
/***************************************************************************/
-#ifndef AHMODULE_H
-#define AHMODULE_H
+#ifndef __AHMODULE_H__
+#define __AHMODULE_H__
+
#include <ft2build.h>
#include FT_MODULE_H
+
FT_BEGIN_HEADER
+
FT_CALLBACK_TABLE
const FT_Module_Class autohint_module_class;
+
FT_END_HEADER
-#endif /* AHMODULE_H */
+#endif /* __AHMODULE_H__ */
/* END */
diff --git a/src/autohint/ahoptim.h b/src/autohint/ahoptim.h
index 9bdf01f..b45366c 100644
--- a/src/autohint/ahoptim.h
+++ b/src/autohint/ahoptim.h
@@ -19,8 +19,8 @@
/***************************************************************************/
-#ifndef AHOPTIM_H
-#define AHOPTIM_H
+#ifndef __AHOPTIM_H__
+#define __AHOPTIM_H__
#include <ft2build.h>
@@ -128,7 +128,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* AHOPTIM_H */
+#endif /* __AHOPTIM_H__ */
/* END */
diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h
index 581259f..6597665 100644
--- a/src/autohint/ahtypes.h
+++ b/src/autohint/ahtypes.h
@@ -20,8 +20,8 @@
/***************************************************************************/
-#ifndef AHTYPES_H
-#define AHTYPES_H
+#ifndef __AHTYPES_H__
+#define __AHTYPES_H__
#include <ft2build.h>
@@ -46,6 +46,7 @@
FT_BEGIN_HEADER
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -484,7 +485,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* AHTYPES_H */
+#endif /* __AHTYPES_H__ */
/* END */
diff --git a/src/cff/cffdrivr.h b/src/cff/cffdrivr.h
index 5d19ba0..846e0b1 100644
--- a/src/cff/cffdrivr.h
+++ b/src/cff/cffdrivr.h
@@ -16,12 +16,14 @@
/***************************************************************************/
-#ifndef CFFDRIVER_H
-#define CFFDRIVER_H
+#ifndef __CFFDRIVER_H__
+#define __CFFDRIVER_H__
+
#include <ft2build.h>
#include FT_INTERNAL_DRIVER_H
+
FT_BEGIN_HEADER
@@ -31,7 +33,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* CFFDRIVER_H */
+#endif /* __CFFDRIVER_H__ */
/* END */
diff --git a/src/cff/cffload.h b/src/cff/cffload.h
index 99b2d44..46a06d9 100644
--- a/src/cff/cffload.h
+++ b/src/cff/cffload.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef CFFLOAD_H
-#define CFFLOAD_H
+#ifndef __CFFLOAD_H__
+#define __CFFLOAD_H__
#include <ft2build.h>
@@ -64,7 +64,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* CFFLOAD_H */
+#endif /* __CFFLOAD_H__ */
/* END */
diff --git a/src/cff/cffobjs.h b/src/cff/cffobjs.h
index 9633cff..8b1dcf1 100644
--- a/src/cff/cffobjs.h
+++ b/src/cff/cffobjs.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T2OBJS_H
-#define T2OBJS_H
+#ifndef __CFFOBJS_H__
+#define __CFFOBJS_H__
#include <ft2build.h>
@@ -138,7 +138,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T2OBJS_H */
+#endif /* __CFFOBJS_H__ */
/* END */
diff --git a/src/cff/t2gload.h b/src/cff/t2gload.h
index 0450dda..77f8662 100644
--- a/src/cff/t2gload.h
+++ b/src/cff/t2gload.h
@@ -16,15 +16,18 @@
/***************************************************************************/
-#ifndef T2GLOAD_H
-#define T2GLOAD_H
+#ifndef __T2GLOAD_H__
+#define __T2GLOAD_H__
+
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_SOURCE_FILE(cff,cffobjs.h)
+
FT_BEGIN_HEADER
+
#define T2_MAX_OPERANDS 48
#define T2_MAX_SUBRS_CALLS 32
@@ -194,7 +197,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T2GLOAD_H */
+#endif /* __T2GLOAD_H__ */
/* END */
diff --git a/src/cid/cidafm.h b/src/cid/cidafm.h
index fd34fcc..fe63b5f 100644
--- a/src/cid/cidafm.h
+++ b/src/cid/cidafm.h
@@ -16,8 +16,9 @@
/***************************************************************************/
-#ifndef CIDAFM_H
-#define CIDAFM_H
+#ifndef __CIDAFM_H__
+#define __CIDAFM_H__
+
#include <ft2build.h>
#include FT_SOURCE_FILE(cid,cidobjs.h)
@@ -60,7 +61,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* CIDAFM_H */
+#endif /* __CIDAFM_H__ */
/* END */
diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h
index 1483bc7..a894d97 100644
--- a/src/cid/cidgload.h
+++ b/src/cid/cidgload.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef CIDGLOAD_H
-#define CIDGLOAD_H
+#ifndef __CIDGLOAD_H__
+#define __CIDGLOAD_H__
#include <ft2build.h>
@@ -26,6 +26,7 @@
FT_BEGIN_HEADER
+
#if 0
/* Compute the maximum advance width of a font through quick parsing */
@@ -44,7 +45,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* CIDGLOAD_H */
+#endif /* __CIDGLOAD_H__ */
/* END */
diff --git a/src/cid/cidload.h b/src/cid/cidload.h
index a07c190..d520904 100644
--- a/src/cid/cidload.h
+++ b/src/cid/cidload.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef CIDLOAD_H
-#define CIDLOAD_H
+#ifndef __CIDLOAD_H__
+#define __CIDLOAD_H__
#include <ft2build.h>
@@ -51,7 +51,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* CIDLOAD_H */
+#endif /* __CIDLOAD_H__ */
/* END */
diff --git a/src/cid/cidobjs.h b/src/cid/cidobjs.h
index e68055d..4b4baaf 100644
--- a/src/cid/cidobjs.h
+++ b/src/cid/cidobjs.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef CIDOBJS_H
-#define CIDOBJS_H
+#ifndef __CIDOBJS_H__
+#define __CIDOBJS_H__
#include <ft2build.h>
@@ -29,6 +29,7 @@
FT_BEGIN_HEADER
+
/* The following structures must be defined by the hinter */
typedef struct CID_Size_Hints_ CID_Size_Hints;
typedef struct CID_Glyph_Hints_ CID_Glyph_Hints;
@@ -131,7 +132,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* CIDOBJS_H */
+#endif /* __CIDOBJS_H__ */
/* END */
diff --git a/src/cid/cidparse.h b/src/cid/cidparse.h
index 2ec43ef..c6aaa3e 100644
--- a/src/cid/cidparse.h
+++ b/src/cid/cidparse.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef CIDPARSE_H
-#define CIDPARSE_H
+#ifndef __CIDPARSE_H__
+#define __CIDPARSE_H__
#include <ft2build.h>
@@ -110,7 +110,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* CIDPARSE_H */
+#endif /* __CIDPARSE_H__ */
/* END */
diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h
index 3e4263c..134cbb5 100644
--- a/src/cid/cidriver.h
+++ b/src/cid/cidriver.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef CIDRIVER_H
-#define CIDRIVER_H
+#ifndef __CIDRIVER_H__
+#define __CIDRIVER_H__
#include <ft2build.h>
@@ -33,7 +33,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* CIDRIVER_H */
+#endif /* __CIDRIVER_H__ */
/* END */
diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c
index d0a1728..f27a499 100644
--- a/src/cid/type1cid.c
+++ b/src/cid/type1cid.c
@@ -1,6 +1,6 @@
/***************************************************************************/
/* */
-/* cff.c */
+/* type1cid.c */
/* */
/* FreeType OpenType driver component (body only). */
/* */
diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h
index 3f23dc0..f71d548 100644
--- a/src/psaux/psauxmod.h
+++ b/src/psaux/psauxmod.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef PSAUXMOD_H
-#define PSAUXMOD_H
+#ifndef __PSAUXMOD_H__
+#define __PSAUXMOD_H__
#include <ft2build.h>
@@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* PSAUXMOD_H */
+#endif /* __PSAUXMOD_H__ */
/* END */
diff --git a/src/psaux/psobjs.h b/src/psaux/psobjs.h
index af586b4..c0e482a 100644
--- a/src/psaux/psobjs.h
+++ b/src/psaux/psobjs.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef PSOBJS_H
-#define PSOBJS_H
+#ifndef __PSOBJS_H__
+#define __PSOBJS_H__
#include <ft2build.h>
@@ -197,7 +197,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* PSOBJS_H */
+#endif /* __PSOBJS_H__ */
/* END */
diff --git a/src/psaux/t1decode.h b/src/psaux/t1decode.h
index b5f4c16..7b24ee3 100644
--- a/src/psaux/t1decode.h
+++ b/src/psaux/t1decode.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T1DECODE_H
-#define T1DECODE_H
+#ifndef __T1DECODE_H__
+#define __T1DECODE_H__
#include <ft2build.h>
@@ -57,7 +57,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T1DECODE_H */
+#endif /* __T1DECODE_H__ */
/* END */
diff --git a/src/psnames/psmodule.h b/src/psnames/psmodule.h
index 12ec48d..8694ca8 100644
--- a/src/psnames/psmodule.h
+++ b/src/psnames/psmodule.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef PSDRIVER_H
-#define PSDRIVER_H
+#ifndef __PSMODULE_H__
+#define __PSMODULE_H__
#include <ft2build.h>
@@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* PSDRIVER_H */
+#endif /* __PSMODULE_H__ */
/* END */
diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c
index 55824a0..07b5e15 100644
--- a/src/psnames/psnames.c
+++ b/src/psnames/psnames.c
@@ -21,7 +21,5 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(psnames,psmodule.c)
-#endif
-
/* END */
diff --git a/src/raster/ftraster.h b/src/raster/ftraster.h
index e48c708..46985e6 100644
--- a/src/raster/ftraster.h
+++ b/src/raster/ftraster.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef FTRASTER_H
-#define FTRASTER_H
+#ifndef __FTRASTER_H__
+#define __FTRASTER_H__
#include <ft2build.h>
@@ -40,7 +40,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* FTRASTER_H */
+#endif /* __FTRASTER_H__ */
/* END */
diff --git a/src/raster/ftrend1.h b/src/raster/ftrend1.h
index da4d0c5..c22779e 100644
--- a/src/raster/ftrend1.h
+++ b/src/raster/ftrend1.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef FTREND1_H
-#define FTREND1_H
+#ifndef __FTREND1_H__
+#define __FTREND1_H__
#include <ft2build.h>
@@ -38,7 +38,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* FTREND1_H */
+#endif /* __FTREND1_H__ */
/* END */
diff --git a/src/raster/raster.c b/src/raster/raster.c
index 32fade4..96894a5 100644
--- a/src/raster/raster.c
+++ b/src/raster/raster.c
@@ -1,6 +1,6 @@
/***************************************************************************/
/* */
-/* raster1.c */
+/* raster.c */
/* */
/* FreeType monochrome rasterer module component (body only). */
/* */
diff --git a/src/sfnt/sfdriver.h b/src/sfnt/sfdriver.h
index f70b065..c2b9a9d 100644
--- a/src/sfnt/sfdriver.h
+++ b/src/sfnt/sfdriver.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef SFDRIVER_H
-#define SFDRIVER_H
+#ifndef __SFDRIVER_H__
+#define __SFDRIVER_H__
#include <ft2build.h>
@@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* SFDRIVER_H */
+#endif /* __SFDRIVER_H__ */
/* END */
diff --git a/src/sfnt/sfobjs.h b/src/sfnt/sfobjs.h
index f41504d..9c428a6 100644
--- a/src/sfnt/sfobjs.h
+++ b/src/sfnt/sfobjs.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef SFOBJS_H
-#define SFOBJS_H
+#ifndef __SFOBJS_H__
+#define __SFOBJS_H__
#include <ft2build.h>
@@ -27,6 +27,7 @@
FT_BEGIN_HEADER
+
FT_LOCAL
FT_Error SFNT_Init_Face( FT_Stream stream,
TT_Face face,
@@ -47,7 +48,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* SFDRIVER_H */
+#endif /* __SFDRIVER_H__ */
/* END */
diff --git a/src/sfnt/ttcmap.h b/src/sfnt/ttcmap.h
index 6c8db11..e2c6ab5 100644
--- a/src/sfnt/ttcmap.h
+++ b/src/sfnt/ttcmap.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef TTCMAP_H
-#define TTCMAP_H
+#ifndef __TTCMAP_H__
+#define __TTCMAP_H__
#include <ft2build.h>
@@ -39,7 +39,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTCMAP_H */
+#endif /* __TTCMAP_H__ */
/* END */
diff --git a/src/sfnt/ttload.h b/src/sfnt/ttload.h
index 1642283..152f65b 100644
--- a/src/sfnt/ttload.h
+++ b/src/sfnt/ttload.h
@@ -17,8 +17,8 @@
/***************************************************************************/
-#ifndef TTLOAD_H
-#define TTLOAD_H
+#ifndef __TTLOAD_H__
+#define __TTLOAD_H__
#include <ft2build.h>
@@ -130,7 +130,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTLOAD_H */
+#endif /* __TTLOAD_H__ */
/* END */
diff --git a/src/sfnt/ttpost.h b/src/sfnt/ttpost.h
index 7fca4b2..094f239 100644
--- a/src/sfnt/ttpost.h
+++ b/src/sfnt/ttpost.h
@@ -17,8 +17,8 @@
/***************************************************************************/
-#ifndef TTPOST_H
-#define TTPOST_H
+#ifndef __TTPOST_H__
+#define __TTPOST_H__
#include <ft2build.h>
@@ -44,7 +44,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTPOST_H */
+#endif /* __TTPOST_H__ */
/* END */
diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h
index 847532a..bda3829 100644
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef TTSBIT_H
-#define TTSBIT_H
+#ifndef __TTSBIT_H__
+#define __TTSBIT_H__
#include <ft2build.h>
@@ -53,7 +53,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTSBIT_H */
+#endif /* __TTSBIT_H__ */
/* END */
diff --git a/src/smooth/ftgrays.h b/src/smooth/ftgrays.h
index fd71c10..82492b5 100644
--- a/src/smooth/ftgrays.h
+++ b/src/smooth/ftgrays.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef FTGRAYS_H
-#define FTGRAYS_H
+#ifndef __FTGRAYS_H__
+#define __FTGRAYS_H__
#ifdef __cplusplus
extern "C" {
@@ -51,7 +51,7 @@
}
#endif
-#endif /* FTGRAYS_H */
+#endif /* __FTGRAYS_H__ */
/* END */
diff --git a/src/smooth/ftsmooth.h b/src/smooth/ftsmooth.h
index dc35c84..64b24d0 100644
--- a/src/smooth/ftsmooth.h
+++ b/src/smooth/ftsmooth.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef FTSMOOTH_H
-#define FTSMOOTH_H
+#ifndef __FTSMOOTH_H__
+#define __FTSMOOTH_H__
#include <ft2build.h>
@@ -38,7 +38,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* FTSMOOTH_H */
+#endif /* __FTSMOOTH_H__ */
/* END */
diff --git a/src/truetype/ttdriver.h b/src/truetype/ttdriver.h
index 12d267d..c33ff76 100644
--- a/src/truetype/ttdriver.h
+++ b/src/truetype/ttdriver.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef TTDRIVER_H
-#define TTDRIVER_H
+#ifndef __TTDRIVER_H__
+#define __TTDRIVER_H__
#include <ft2build.h>
@@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTDRIVER_H */
+#endif /* __TTDRIVER_H__ */
/* END */
diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h
index bbb304f..3bd41b6 100644
--- a/src/truetype/ttgload.h
+++ b/src/truetype/ttgload.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef TTGLOAD_H
-#define TTGLOAD_H
+#ifndef __TTGLOAD_H__
+#define __TTGLOAD_H__
#include <ft2build.h>
@@ -49,7 +49,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTGLOAD_H */
+#endif /* __TTGLOAD_H__ */
/* END */
diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index fd6a858..b6f861c 100644
--- a/src/truetype/ttinterp.h
+++ b/src/truetype/ttinterp.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef TTINTERP_H
-#define TTINTERP_H
+#ifndef __TTINTERP_H__
+#define __TTINTERP_H__
#include <ft2build.h>
@@ -304,7 +304,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTINTERP_H */
+#endif /* __TTINTERP_H__ */
/* END */
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index 5c0b459..67d2940 100644
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef TTOBJS_H
-#define TTOBJS_H
+#ifndef __TTOBJS_H__
+#define __TTOBJS_H__
#include <ft2build.h>
@@ -417,7 +417,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTOBJS_H */
+#endif /* __TTOBJS_H__ */
/* END */
diff --git a/src/truetype/ttpload.h b/src/truetype/ttpload.h
index 6187946..d6fb524 100644
--- a/src/truetype/ttpload.h
+++ b/src/truetype/ttpload.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef TTPLOAD_H
-#define TTPLOAD_H
+#ifndef __TTPLOAD_H__
+#define __TTPLOAD_H__
#include <ft2build.h>
@@ -42,7 +42,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* TTPLOAD_H */
+#endif /* __TTPLOAD_H__ */
/* END */
diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h
index cc8adb9..8426b10 100644
--- a/src/type1/t1afm.h
+++ b/src/type1/t1afm.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T1AFM_H
-#define T1AFM_H
+#ifndef __T1AFM_H__
+#define __T1AFM_H__
#include <ft2build.h>
#include FT_SOURCE_FILE(type1,t1objs.h)
@@ -60,7 +60,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T1AFM_H */
+#endif /* __T1AFM_H__ */
/* END */
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index a00ab57..e933e88 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -15,6 +15,7 @@
/* */
/***************************************************************************/
+
#include <ft2build.h>
#include FT_SOURCE_FILE(type1,t1driver.h)
#include FT_SOURCE_FILE(type1,t1gload.h)
diff --git a/src/type1/t1driver.h b/src/type1/t1driver.h
index a03fc7b..e33c068 100644
--- a/src/type1/t1driver.h
+++ b/src/type1/t1driver.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T1DRIVER_H
-#define T1DRIVER_H
+#ifndef __T1DRIVER_H__
+#define __T1DRIVER_H__
#include <ft2build.h>
@@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T1DRIVER_H */
+#endif /* __T1DRIVER_H__ */
/* END */
diff --git a/src/type1/t1gload.h b/src/type1/t1gload.h
index 14c6a58..0c48eaf 100644
--- a/src/type1/t1gload.h
+++ b/src/type1/t1gload.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T1GLOAD_H
-#define T1GLOAD_H
+#ifndef __T1GLOAD_H__
+#define __T1GLOAD_H__
#include <ft2build.h>
@@ -40,7 +40,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T1GLOAD_H */
+#endif /* __T1GLOAD_H__ */
/* END */
diff --git a/src/type1/t1load.h b/src/type1/t1load.h
index 424f66c..40100d2 100644
--- a/src/type1/t1load.h
+++ b/src/type1/t1load.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T1LOAD_H
-#define T1LOAD_H
+#ifndef __T1LOAD_H__
+#define __T1LOAD_H__
#include <ft2build.h>
@@ -77,7 +77,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T1LOAD_H */
+#endif /* __T1LOAD_H__ */
/* END */
diff --git a/src/type1/t1objs.h b/src/type1/t1objs.h
index d3dc0c0..8c83fa7 100644
--- a/src/type1/t1objs.h
+++ b/src/type1/t1objs.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T1OBJS_H
-#define T1OBJS_H
+#ifndef __T1OBJS_H__
+#define __T1OBJS_H__
#include <ft2build.h>
@@ -155,7 +155,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T1OBJS_H */
+#endif /* __T1OBJS_H__ */
/* END */
diff --git a/src/type1/t1parse.h b/src/type1/t1parse.h
index 0124107..8b91b3c 100644
--- a/src/type1/t1parse.h
+++ b/src/type1/t1parse.h
@@ -16,8 +16,8 @@
/***************************************************************************/
-#ifndef T1PARSE_H
-#define T1PARSE_H
+#ifndef __T1PARSE_H__
+#define __T1PARSE_H__
#include <ft2build.h>
@@ -128,7 +128,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* T1PARSE_H */
+#endif /* __T1PARSE_H__ */
/* END */
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 798027d..210c15a 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -16,22 +16,13 @@
/***************************************************************************/
-#ifdef FT_FLAT_COMPILE
-
-#include "winfnt.h"
-
-#else
-
-#include <winfonts/winfnt.h>
-
-#endif
-
-
-#include <freetype/fterrors.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/fnttypes.h>
+#include <ft2build.h>
+#include FT_ERRORS_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_FNT_TYPES_H
+#include FT_SOURCE_FILE(winfonts,winfnt.h)
/*************************************************************************/
diff --git a/src/winfonts/winfnt.h b/src/winfonts/winfnt.h
index ba215b7..85defc7 100644
--- a/src/winfonts/winfnt.h
+++ b/src/winfonts/winfnt.h
@@ -16,26 +16,24 @@
/***************************************************************************/
-#ifndef WINFNT_H
-#define WINFNT_H
+#ifndef __WINFNT_H__
+#define __WINFNT_H__
-#include <freetype/internal/ftdriver.h>
+#include <ft2build.h>
+#include FT_INTERNAL_DRIVER_H
-#ifdef __cplusplus
- extern "C" {
-#endif
+
+FT_BEGIN_HEADER
FT_EXPORT_VAR( const FT_Driver_Class ) winfnt_driver_class;
-#ifdef __cplusplus
- }
-#endif
+FT_END_HEADER
-#endif /* WINFNT_H */
+#endif /* __WINFNT_H__ */
/* END */