diff options
| author | Werner Lemberg <wl@gnu.org> | 2000-12-12 22:28:12 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2000-12-12 22:28:12 +0000 |
| commit | d5c1b27d58c4308745338cb0f3f710d6c1549982 (patch) | |
| tree | fa9da3c4d5bbac9b6c614284d55a0e168a87aa1f /src/base/ftinit.c | |
| parent | 4978d04e5f87d388b5463e7dafc65144a4731654 (diff) | |
* include/freetype/config/ft2build.h (FT2_ROOT, FT2_CONFIG_ROOT):
Removed. ANSI C doesn't (explicitly) allow macro expansion in
arguments using `##'.
(FT2_PUBLIC_FILE, FT2_CONFIG_FILE, FT2_INTERNAL_FILE): Use directory
names directly. Make them configurable. Use `##' to strip leading
and trailing spaces from arguments.
* builds/unix/ft2unix.h: Adapted.
* src/base/ftsystem.c (ft_alloc, ft_realloc, ft_free, ft_io_stream,
ft_close_stream): Use FT_CALLBACK_DEF.
* builds/unix/ftsystem.c: Use new header scheme.
(FT_Done_Memory): Use free() from FT_Memory structure.
* src/base/ftinit.c, src/base/ftmac.c: Header scheme fixes.
* include/freetype/config/ft2build.h (FT2_CONFIG_ROOT,
FT2_PUBLIC_FILE, FT2_CONFIG_FILE, FT2_INTERNAL_FILE,
FT_SOURCE_FILE): Use `##' operator to be really ANSI C compliant.
Diffstat (limited to 'src/base/ftinit.c')
| -rw-r--r-- | src/base/ftinit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/base/ftinit.c b/src/base/ftinit.c index f0d1e8d7..9a0d2164 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -60,7 +60,9 @@ #define FT_USE_MODULE( x ) extern const FT_Module_Class* x; #endif -#include <freetype/config/ftmodule.h> + +#include FT_CONFIG_MODULES_H + #undef FT_USE_MODULE #define FT_USE_MODULE( x ) (const FT_Module_Class*)&x, @@ -68,7 +70,7 @@ static const FT_Module_Class* const ft_default_modules[] = { -#include <freetype/config/ftmodule.h> +#include FT_CONFIG_MODULES_H 0 }; |