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 /include/ft2build.h | |
| parent | 4978d04e5f87d388b5463e7dafc65144a4731654 (diff) | |
| download | freetype2-d5c1b27d58c4308745338cb0f3f710d6c1549982.tar.gz | |
* 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 'include/ft2build.h')
| -rw-r--r-- | include/ft2build.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/include/ft2build.h b/include/ft2build.h index 563b1b85a..3da8add34 100644 --- a/include/ft2build.h +++ b/include/ft2build.h @@ -14,26 +14,20 @@ /* 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 FT_ROOT freetype2 */ -/* #include <FT_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 configuration. */ + /* See builds/unix/ft2unix.h for an example. */ + /* */ + /*************************************************************************/ + + #ifndef __FT2_BUILD_GENERIC_H__ #define __FT2_BUILD_GENERIC_H__ @@ -41,4 +35,5 @@ #endif /* __FT2_BUILD_GENERIC_H__ */ + /* END */ |