Commit 8cfe002db957efbb34f504e2ebd4be69dfc7c524
2001-03-18T00:26:23
renamed <freetype/config/ft2build.h> to 'ftheader.h' to avoid name conflicts with top-level <ft2build.h> added some comments for docmaker in ftheader.h in order to document the header file macros..
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
diff --git a/ChangeLog b/ChangeLog
index d7e7cdf..3610105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,14 @@
* src/cid/cidobjs.c, src/cid/cidload.c, src/pcf/pcfread.c,
src/type1/t1load.c, src/type1/t1objs.c: added a few casts to remove
- compiler warnings in pedantic modes..
+ compiler warnings in pedantic modes..
+
+ * include/config/ft2build.h, include/config/ftheader.h: the file
+ "ft2build.h" was renamed to "ftheader.h" to avoid conflicts with the
+ top-level <ft2build.h>
+
+ * include/config/ftheader.h: added new section describing the #include
+ macros..
2001-03-17 Tom Kacvinsky <tjk@ams.org>
diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h
deleted file mode 100644
index 13603f0..0000000
--- a/include/freetype/config/ft2build.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/***************************************************************************/
-/* */
-/* ft2build.h */
-/* */
-/* Build macros of the FreeType 2 library. */
-/* */
-/* Copyright 1996-2000 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* 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 configuration. */
- /* For example, on Unix, the "freetype2" include root could be used, */
- /* with a specific "ft2build.h" to take care of this. The latter then */
- /* looks like the following: */
- /* */
- /* #ifndef __FT2_BUILD_UNIX_H__ */
- /* #define __FT2_BUILD_UNIX_H__ */
- /* */
- /* #define FT2_ROOT freetype2 */
- /* #include <freetype2/config/ft2build.h> */
- /* */
- /* #include FT2_CONFIG_FILE( ft2build.h ) */
- /* */
- /* #endif */
- /* */
- /* If necessary, the macro FT_SOURCE_FILE() can be redefined also if a */
- /* different path separator is needed. */
- /* */
- /*************************************************************************/
-
-
-#ifndef __FT2_BUILD_H__
-#define __FT2_BUILD_H__
-
-
- /* this macro is used to enclose its argument in brackets */
-#define FT2_ENCLOSE(x) <x>
-
- /* this macro is used to join a path and a file name */
-#define FT2_JOINPATH(d,x) d/x
-
- /* this macro is used to format a path in "<d/x>" format easily */
-#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x)
-
-
-
- /*************************************************************************/
- /* */
- /* The macro FT2_ROOT is used to define the root of all public header */
- /* files for FreeType 2. By default, it is set to "freetype", which */
- /* means that all public files should be included with a line like: */
- /* */
- /* #include <freetype/...> */
- /* */
- /* Redefine it to something different if necessary, depending where the */
- /* library is installed on the particular system. */
- /* */
-#ifndef FT2_ROOT
-#define FT2_ROOT freetype
-#endif
-
-
- /*************************************************************************/
- /* */
- /* The macro FT2_CONFIG_ROOT is used to define the root of all */
- /* configuration header files for FreeType 2. By default, it is set to */
- /* "freetype/config", which means that all config files should be */
- /* include with a line like: */
- /* */
- /* #include <freetype/config/...> */
- /* */
- /* Redefine it to something different, depending where the library is */
- /* installed on the particular system. */
- /* */
-#ifndef FT2_CONFIG_ROOT
-#define FT2_CONFIG_ROOT FT2_JOINPATH(FT2_ROOT,config)
-#endif
-
-
-#define FT2_INTERNAL_ROOT FT2_JOINPATH(FT2_ROOT,internal)
-
- /*************************************************************************/
- /* */
- /* The macro FT2_PUBLIC_FILE is used to include a FreeType 2 public file.*/
- /* Its parameter is the file pathname, relative to the public root of a */
- /* given header file. */
- /* */
-#define FT2_PUBLIC_FILE( x ) FT2_PUBLIC_PATH(FT2_ROOT,x)
-
-
- /*************************************************************************/
- /* */
- /* The macro FT2_CONFIG_FILE is used to include a FreeType 2 config file.*/
- /* Its parameter is the file pathname, relative to the configuration */
- /* root directory of a given header file. */
- /* */
-#define FT2_CONFIG_FILE( x ) FT2_PUBLIC_PATH(FT2_CONFIG_ROOT,x)
-
-
- /*************************************************************************/
- /* */
- /* The macro FT2_INTERNAL_FILE is used to include a FreeType 2 internal */
- /* file. Its parameter is the file pathname, relative to the */
- /* configuration root directory of a given header file. */
- /* */
-#define FT2_INTERNAL_FILE( x ) FT2_ENCLOSE(FT2_ROOT/internal/x)
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_SOURCE_FILE is used to include a given FreeType 2 */
- /* component source file (be it a header, a C source file, or an */
- /* included file). */
- /* */
- /* Its first argument is the component/module's directory according to */
- /* the normal FreeType 2 source directory hierarchy, and the second one */
- /* the file name. */
- /* */
- /* Note that you can also put all library source files in a single */
- /* directory and compile them normally by defining the macro */
- /* FT_FLAT_COMPILATION. */
- /* */
-#ifndef FT_SOURCE_FILE
-
-#ifdef FT_FLAT_COMPILATION
-#define FT_SOURCE_FILE( d, x ) #x
-#else
-#define FT_SOURCE_FILE( d, x ) FT2_PUBLIC_PATH(d,x)
-#endif
-
-#endif /* !FT_SOURCE_FILE */
-
-
- /*************************************************************************/
- /* */
- /* <Macro> */
- /* FT_BEGIN_HEADER */
- /* */
- /* <Description> */
- /* This macro is used in association with @FT_END_HEADER in header */
- /* files to ensure that the declarations within are properly */
- /* encapsulated in an `extern "C" { .. }' block when included from a */
- /* C++ compiler. */
- /* */
-#ifdef __cplusplus
-#define FT_BEGIN_HEADER extern "C" {
-#else
-#define FT_BEGIN_HEADER /* nothing */
-#endif
-
-
- /*************************************************************************/
- /* */
- /* <Macro> */
- /* FT_END_HEADER */
- /* */
- /* <Description> */
- /* This macro is used in association with @FT_BEGIN_HEADER in header */
- /* files to ensure that the declarations within are properly */
- /* encapsulated in an `extern "C" { .. }' block when included from a */
- /* C++ compiler. */
- /* */
-#ifdef __cplusplus
-#define FT_END_HEADER }
-#else
-#define FT_END_HEADER /* nothing */
-#endif
-
-
- /*************************************************************************/
- /* */
- /* Aliases for the FreeType 2 public and configuration files. */
- /* */
- /*************************************************************************/
-
- /* configuration files */
-#ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h>
-#endif
-
-#ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
-#endif
-
-#ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h>
-#endif
-
- /* public headers */
-#define FT_ERRORS_H <freetype/fterrors.h>
-#define FT_SYSTEM_H <freetype/ftsystem.h>
-#define FT_IMAGE_H <freetype/ftimage.h>
-
-#define FT_TYPES_H <freetype/fttypes.h>
-
-#define FT_FREETYPE_H <freetype/freetype.h>
-#define FT_GLYPH_H <freetype/ftglyph.h>
-#define FT_BBOX_H <freetype/ftbbox.h>
-#define FT_CACHE_H <freetype/ftcache.h>
-#define FT_LIST_H <freetype/ftlist.h>
-#define FT_MAC_H <freetype/ftmac.h>
-#define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h>
-#define FT_MODULE_H <freetype/ftmodule.h>
-#define FT_NAMES_H <freetype/ftnames.h>
-#define FT_OUTLINE_H <freetype/ftoutln.h>
-#define FT_RENDER_H <freetype/ftrender.h>
-#define FT_SYNTHESIS_H <freetype/ftsynth.h>
-#define FT_TYPE1_TABLES_H <freetype/t1tables.h>
-#define FT_TRUETYPE_NAMES_H <freetype/ttnameid.h>
-#define FT_TRUETYPE_TABLES_H <freetype/tttables.h>
-#define FT_TRUETYPE_TAGS_H <freetype/tttags.h>
-
- /* now include internal headers definitions from <freetype/internal/...> */
-#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
-#include FT_INTERNAL_INTERNAL_H
-
-
-#endif /* __FT2_BUILD_H__ */
-
-
-/* END */
diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h
new file mode 100644
index 0000000..f8c16ab
--- /dev/null
+++ b/include/freetype/config/ftheader.h
@@ -0,0 +1,484 @@
+/***************************************************************************/
+/* */
+/* ftheader.h */
+/* */
+/* Build macros of the FreeType 2 library. */
+/* */
+/* Copyright 1996-2000 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* 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 configuration. */
+ /* For example, on Unix, the "freetype2" include root could be used, */
+ /* with a specific "ft2build.h" to take care of this. The latter then */
+ /* looks like the following: */
+ /* */
+ /* #ifndef __FT2_BUILD_UNIX_H__ */
+ /* #define __FT2_BUILD_UNIX_H__ */
+ /* */
+ /* #define FT2_ROOT freetype2 */
+ /* #include <freetype2/config/ft2build.h> */
+ /* */
+ /* #include FT2_CONFIG_FILE( ft2build.h ) */
+ /* */
+ /* #endif */
+ /* */
+ /* If necessary, the macro FT_SOURCE_FILE() can be redefined also if a */
+ /* different path separator is needed. */
+ /* */
+ /*************************************************************************/
+
+
+#ifndef __FT2_BUILD_H__
+#define __FT2_BUILD_H__
+
+
+ /* this macro is used to enclose its argument in brackets */
+#define FT2_ENCLOSE(x) <x>
+
+ /* this macro is used to join a path and a file name */
+#define FT2_JOINPATH(d,x) d/x
+
+ /* this macro is used to format a path in "<d/x>" format easily */
+#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x)
+
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_ROOT is used to define the root of all public header */
+ /* files for FreeType 2. By default, it is set to "freetype", which */
+ /* means that all public files should be included with a line like: */
+ /* */
+ /* #include <freetype/...> */
+ /* */
+ /* Redefine it to something different if necessary, depending where the */
+ /* library is installed on the particular system. */
+ /* */
+#ifndef FT2_ROOT
+#define FT2_ROOT freetype
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_CONFIG_ROOT is used to define the root of all */
+ /* configuration header files for FreeType 2. By default, it is set to */
+ /* "freetype/config", which means that all config files should be */
+ /* include with a line like: */
+ /* */
+ /* #include <freetype/config/...> */
+ /* */
+ /* Redefine it to something different, depending where the library is */
+ /* installed on the particular system. */
+ /* */
+#ifndef FT2_CONFIG_ROOT
+#define FT2_CONFIG_ROOT FT2_JOINPATH(FT2_ROOT,config)
+#endif
+
+
+#define FT2_INTERNAL_ROOT FT2_JOINPATH(FT2_ROOT,internal)
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_PUBLIC_FILE is used to include a FreeType 2 public file.*/
+ /* Its parameter is the file pathname, relative to the public root of a */
+ /* given header file. */
+ /* */
+#define FT2_PUBLIC_FILE( x ) FT2_PUBLIC_PATH(FT2_ROOT,x)
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_CONFIG_FILE is used to include a FreeType 2 config file.*/
+ /* Its parameter is the file pathname, relative to the configuration */
+ /* root directory of a given header file. */
+ /* */
+#define FT2_CONFIG_FILE( x ) FT2_PUBLIC_PATH(FT2_CONFIG_ROOT,x)
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_INTERNAL_FILE is used to include a FreeType 2 internal */
+ /* file. Its parameter is the file pathname, relative to the */
+ /* configuration root directory of a given header file. */
+ /* */
+#define FT2_INTERNAL_FILE( x ) FT2_ENCLOSE(FT2_ROOT/internal/x)
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT_SOURCE_FILE is used to include a given FreeType 2 */
+ /* component source file (be it a header, a C source file, or an */
+ /* included file). */
+ /* */
+ /* Its first argument is the component/module's directory according to */
+ /* the normal FreeType 2 source directory hierarchy, and the second one */
+ /* the file name. */
+ /* */
+ /* Note that you can also put all library source files in a single */
+ /* directory and compile them normally by defining the macro */
+ /* FT_FLAT_COMPILATION. */
+ /* */
+#ifndef FT_SOURCE_FILE
+
+#ifdef FT_FLAT_COMPILATION
+#define FT_SOURCE_FILE( d, x ) #x
+#else
+#define FT_SOURCE_FILE( d, x ) FT2_PUBLIC_PATH(d,x)
+#endif
+
+#endif /* !FT_SOURCE_FILE */
+
+
+ /*************************************************************************/
+ /* */
+ /* <Macro> */
+ /* FT_BEGIN_HEADER */
+ /* */
+ /* <Description> */
+ /* This macro is used in association with @FT_END_HEADER in header */
+ /* files to ensure that the declarations within are properly */
+ /* encapsulated in an `extern "C" { .. }' block when included from a */
+ /* C++ compiler. */
+ /* */
+#ifdef __cplusplus
+#define FT_BEGIN_HEADER extern "C" {
+#else
+#define FT_BEGIN_HEADER /* nothing */
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* <Macro> */
+ /* FT_END_HEADER */
+ /* */
+ /* <Description> */
+ /* This macro is used in association with @FT_BEGIN_HEADER in header */
+ /* files to ensure that the declarations within are properly */
+ /* encapsulated in an `extern "C" { .. }' block when included from a */
+ /* C++ compiler. */
+ /* */
+#ifdef __cplusplus
+#define FT_END_HEADER }
+#else
+#define FT_END_HEADER /* nothing */
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* Aliases for the FreeType 2 public and configuration files. */
+ /* */
+ /*************************************************************************/
+
+/*************************************************************************
+ *
+ * <Section> header_file_macros
+ *
+ * <Title> Header File Macros
+ *
+ * <Abstract>
+ * Macro definitions used to #include specific header files
+ *
+ * <Description>
+ * The following macros are defined to the name of specific FreeType 2
+ * header files. They can be used directly in #include statements as in:
+ *
+ * {
+ * #include FT_FREETYPE_H
+ * #include FT_MULTIPLE_MASTERS_H
+ * #include FT_GLYPH_H
+ * }
+ *
+ * there are several reasons why we're now using macros to name
+ * public header files. The first one is that the macros are not
+ * limited to the infamous 8.3 naming rule required by Dos
+ * (and FT_MULTIPLE_MASTERS_H is a lot more meaningful than "ftmm.h")
+ *
+ * The second reason is that is allows for more flexibility in the way
+ * FreeType 2 is installed on a given system..
+ *
+ */
+
+ /* configuration files */
+/*************************************************************************
+ *
+ * @macro: FT_CONFIG_CONFIG_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * FreeType 2 configuration
+ */
+#ifndef FT_CONFIG_CONFIG_H
+#define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h>
+#endif
+
+/*************************************************************************
+ *
+ * @macro: FT_CONFIG_OPTIONS_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * FreeType 2 project-specific configuration options
+ */
+#ifndef FT_CONFIG_OPTIONS_H
+#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
+#endif
+
+/*************************************************************************
+ *
+ * @macro: FT_CONFIG_MODULES_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the list of FreeType 2 modules that are statically linked to new
+ * library instances in @FT_Init_FreeType
+ */
+#ifndef FT_CONFIG_MODULES_H
+#define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h>
+#endif
+
+ /* public headers */
+/*************************************************************************
+ *
+ * @macro: FT_FREETYPE_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the base FreeType 2 API
+ */
+#define FT_FREETYPE_H <freetype/freetype.h>
+
+
+/*************************************************************************
+ *
+ * @macro: FT_ERRORS_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the list of FreeType 2 error codes (and messages).
+ *
+ * it is included by @FT_FREETYPE_H
+ */
+#define FT_ERRORS_H <freetype/fterrors.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_SYSTEM_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the FreeType 2 interface to low-level operations (i.e. memory management
+ * and stream i/o)
+ *
+ * it is included by @FT_FREETYPE_H
+ */
+#define FT_SYSTEM_H <freetype/ftsystem.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_IMAGE_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * types definitions related to glyph images (i.e. bitmaps, outlines,
+ * scan-converter parameters)
+ *
+ * it is included by @FT_FREETYPE_H
+ */
+#define FT_IMAGE_H <freetype/ftimage.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_TYPES_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the basic data types defined by FreeType 2
+ *
+ * it is included by @FT_FREETYPE_H
+ */
+#define FT_TYPES_H <freetype/fttypes.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_LIST_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the list management API of FreeType 2
+ *
+ * (most applications will never need to include this file)
+ */
+#define FT_LIST_H <freetype/ftlist.h>
+
+
+/*************************************************************************
+ *
+ * @macro: FT_OUTLINE_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the scalable outline management API of FreeType 2
+ */
+#define FT_OUTLINE_H <freetype/ftoutln.h>
+
+
+/*************************************************************************
+ *
+ * @macro: FT_MODULE_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the module management API of FreeType 2
+ */
+#define FT_MODULE_H <freetype/ftmodule.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_RENDER_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the renderer module management API of FreeType 2
+ */
+#define FT_RENDER_H <freetype/ftrender.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_TYPE1_TABLES_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the types and API specific to the Type 1 format.
+ */
+#define FT_TYPE1_TABLES_H <freetype/t1tables.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_TRUETYPE_NAMES_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the enumeration values used to identify name strings, languages,
+ * encodings, etc.. This file really contains a _large_ set of
+ * constant macro definitions, taken from the TrueType and OpenType
+ * specs..
+ */
+#define FT_TRUETYPE_NAMES_H <freetype/ttnameid.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_TRUETYPE_TABLES_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the types and API specific to the TrueType (as well as OpenType) format.
+ */
+#define FT_TRUETYPE_TABLES_H <freetype/tttables.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_TRUETYPE_TAGS_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the definitions of TrueType 4-byte "tags" used to identify blocks
+ * in SFNT-based font formats (i.e. TrueType and OpenType)
+ */
+#define FT_TRUETYPE_TAGS_H <freetype/tttags.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_GLYPH_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the API of the optional glyph management component.
+ */
+#define FT_GLYPH_H <freetype/ftglyph.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_BBOX_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the API of the optional exact bounding box computation routines
+ */
+#define FT_BBOX_H <freetype/ftbbox.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_CACHE_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the API of the optional FreeType 2 cache sub-system.
+ */
+#define FT_CACHE_H <freetype/ftcache.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_MAC_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the Macintosh-specific FreeType 2 API. The latter is used to
+ * access fonts embedded in resource forks..
+ *
+ * this header file must be explicitely included by client applications
+ * compiled on the Mac (note that the base API still works though)
+ */
+#define FT_MAC_H <freetype/ftmac.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_MULTIPLE_MASTERS_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the optional multiple-masters management API of FreeType 2
+ */
+#define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_NAMES_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the optional FreeType 2 API used to access embedded "name" strings
+ * in SFNT-based font formats (i.e. TrueType and OpenType)
+ */
+#define FT_NAMES_H <freetype/ftnames.h>
+
+ /* */
+
+#define FT_SYNTHESIS_H <freetype/ftsynth.h>
+
+
+ /* now include internal headers definitions from <freetype/internal/...> */
+#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
+#include FT_INTERNAL_INTERNAL_H
+
+
+#endif /* __FT2_BUILD_H__ */
+
+
+/* END */
diff --git a/include/freetype/ftchapters.h b/include/freetype/ftchapters.h
index cb1c33d..fcca1da 100644
--- a/include/freetype/ftchapters.h
+++ b/include/freetype/ftchapters.h
@@ -17,6 +17,7 @@
/* sfnt_names */
/* module_management */
/* system_interface */
+/* header_file_macros */
/* */
/***************************************************************************/
diff --git a/include/ft2build.h b/include/ft2build.h
index 3da8add..cd94c00 100644
--- a/include/ft2build.h
+++ b/include/ft2build.h
@@ -31,7 +31,7 @@
#ifndef __FT2_BUILD_GENERIC_H__
#define __FT2_BUILD_GENERIC_H__
-#include <freetype/config/ft2build.h>
+#include <freetype/config/ftheader.h>
#endif /* __FT2_BUILD_GENERIC_H__ */