Commit 0f4d90d2 authored by Werner Lemberg's avatar Werner Lemberg
Browse files

* 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.
parent 282a4742
2000-12-12 Werner Lemberg <wl@gnu.org>
* 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.
2000-12-11 Werner Lemberg <wl@gnu.org>
* include/freetype/config/build.h (FT2_CONFIG_ROOT, FT2_PUBLIC_FILE,
FT2_CONFIG_FILE, FT2_INTERNAL_FILE, FT_SOURCE_FILE): Use `##'
operator to be really ANSI C compliant.
* 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.
2000-12-09 Werner Lemberg <wl@gnu.org>
......
......@@ -13,22 +13,30 @@
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
/* */
/* */
/* This is a Unix-specific version of <ft2build.h> that should be */
/* used exclusively _once_ the library has been installed on the */
/* system. */
/* */
/* currently, the FreeType 2 root is at "freetype2/freetype", though */
/* it will change to a simple "freetype2" in the near future.. */
/* */
/***************************************************************************/
/*************************************************************************/
/* */
/* This is a Unix-specific version of <ft2build.h> that should be used */
/* exclusively *after* installation of the library. */
/* */
/* Currently, the FreeType 2 root is at "freetype2/freetype", though it */
/* will change to "freetype2" in the near future. */
/* */
/*************************************************************************/
#ifndef __FT2_BUILD_UNIX_H__
#define __FT2_BUILD_UNIX_H__
#define FT2_ROOT freetype2/freetype
#include <FT2_ROOT/config/ft2build.h>
#define FT2_PUBLIC_FILE( x ) <freetype2/freetype/ ## x ## >
#define FT2_CONFIG_FILE( x ) <freetype2/freetype/config/ ## x ## >
#define FT2_INTERNAL_FILE( x ) <freetype2/freetype/internal/ ## x ## >
#include FT2_CONFIG_FILE( ft2build.h )
#endif /* __FT2_BUILD_UNIX_H__ */
/* END */
......@@ -16,17 +16,13 @@
/***************************************************************************/
#include <ftconfig.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/ftsystem.h>
#include <freetype/fterrors.h>
#include <freetype/fttypes.h>
#include <freetype/internal/ftobjs.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_INTERNAL_DEBUG_H
#include FT_SYSTEM_H
#include FT_ERRORS_H
#include FT_TYPES_h
#include FT_INTERNAL_FTOBJS_H
/* memory-mapping includes and definitions */
#ifdef HAVE_UNISTD_H
......@@ -87,10 +83,11 @@
/* */
/* <Input> */
/* memory :: A pointer to the memory object. */
/* */
/* size :: The requested size in bytes. */
/* */
/* <Return> */
/* block :: The address of newly allocated block. */
/* The address of newly allocated block. */
/* */
FT_CALLBACK_DEF
void* ft_alloc( FT_Memory memory,
......@@ -201,23 +198,8 @@
}
/*************************************************************************/
/* */
/* <Function> */
/* FT_New_Stream */
/* */
/* <Description> */
/* Creates a new stream object. */
/* */
/* <Input> */
/* filepathname :: The name of the stream (usually a file) to be */
/* opened. */
/* */
/* stream :: A pointer to the stream object. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
/* documentation is in ftobjs.h */
FT_EXPORT_DEF( FT_Error ) FT_New_Stream( const char* filepathname,
FT_Stream stream )
{
......@@ -285,17 +267,8 @@
}
/*************************************************************************/
/* */
/* <Function> */
/* FT_New_Memory */
/* */
/* <Description> */
/* Creates a new memory object. */
/* */
/* <Return> */
/* A pointer to the new memory object. 0 in case of error. */
/* */
/* documentation is in ftobjs.h */
FT_EXPORT_DEF( FT_Memory ) FT_New_Memory( void )
{
FT_Memory memory;
......@@ -314,20 +287,11 @@
}
/*************************************************************************/
/* */
/* <Function> */
/* FT_Done_Memory */
/* */
/* <Description> */
/* Discards memory manager. */
/* */
/* <Input> */
/* memory :: A handle to the memory manager. */
/* */
/* documentation is in ftobjs.h */
FT_EXPORT_DEF( void ) FT_Done_Memory( FT_Memory memory )
{
free( memory );
memory->free( memory, memory );
}
......
......@@ -21,18 +21,24 @@
/* 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: */
/* 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 __FT_BUILD_UNIX_H__ */
/* #define __FT_BUILD_UNIX_H__ */
/* #ifndef __FT2_BUILD_UNIX_H__ */
/* #define __FT2_BUILD_UNIX_H__ */
/* */
/* #define FT2_ROOT freetype2 */
/* #include <FT2_ROOT/config/ft2build.h> */
/* #define FT2_PUBLIC_FILE( x ) <freetype2/ ## x ## > */
/* #define FT2_CONFIG_FILE( x ) <freetype2/config/ ## x ## > */
/* #define FT2_INTERNAL_FILE( x ) <freetype2/internal/ ## x ## > */
/* */
/* #endif // __FT_BUILD_UNIX_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. */
/* */
/*************************************************************************/
......@@ -41,58 +47,30 @@
#define __FT2_BUILD_H__
/*************************************************************************/
/* */
/* 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
/* We use `##' around some arguments to eliminate leading and trailing */
/* spaces. */
/*************************************************************************/
/* */
/* 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/...> */
/* 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. */
/* */
/* Redefine it to something different, depending where the library is */
/* installed on the particular system. */
/* */
#ifndef FT2_CONFIG_ROOT
#define FT2_CONFIG_ROOT_( x ) x ## / ## config
#define FT2_CONFIG_ROOT FT2_CONFIG_ROOT_(FT2_ROOT)
#ifndef FT2_PUBLIC_FILE
#define FT2_PUBLIC_FILE( x ) <freetype/ ## x ## >
#endif
/*************************************************************************/
/* */
/* 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, y ) < ## x ## / ## y ## >
#define FT2_PUBLIC_FILE( x ) FT2_PUBLIC_FILE_(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. */
/* 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, y ) < ## x ## / ## y ## >
#define FT2_CONFIG_FILE( x ) FT2_CONFIG_FILE_(FT2_CONFIG_ROOT,x)
#ifndef FT2_CONFIG_FILE
#define FT2_CONFIG_FILE( x ) <freetype/config/ ## x ## >
#endif
/*************************************************************************/
......@@ -101,8 +79,9 @@
/* file. Its parameter is the file pathname, relative to the */
/* configuration root directory of a given header file. */
/* */
#define FT2_INTERNAL_FILE_( x, y ) < ## x ## / ## internal ## / ## y ## >
#define FT2_INTERNAL_FILE( x ) FT2_INTERNAL_FILE_(FT2_ROOT,x)
#ifndef FT2_INTERNAL_FILE
#define FT2_INTERNAL_FILE( x ) <freetype/internal/ ## x ## >
#endif
/*************************************************************************/
......@@ -119,12 +98,16 @@
/* 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 ) < ## d ## / ## x ## >
#endif
#endif /* !FT_SOURCE_FILE */
/*************************************************************************/
/* */
......@@ -168,48 +151,46 @@
/* */
/*************************************************************************/
/* don't add spaces around arguments to FT2_CONFIG_FILE! */
/* configuration files */
#ifndef FT_CONFIG_CONFIG_H
#define FT_CONFIG_CONFIG_H FT2_CONFIG_FILE(ftconfig.h)
#define FT_CONFIG_CONFIG_H FT2_CONFIG_FILE( ftconfig.h )
#endif
#ifndef FT_CONFIG_OPTIONS_H
#define FT_CONFIG_OPTIONS_H FT2_CONFIG_FILE(ftoption.h)
#define FT_CONFIG_OPTIONS_H FT2_CONFIG_FILE( ftoption.h )
#endif
#ifndef FT_CONFIG_MODULES_H
#define FT_CONFIG_MODULES_H FT2_CONFIG_FILE(ftmodule.h)
#define FT_CONFIG_MODULES_H FT2_CONFIG_FILE( ftmodule.h )
#endif
/* public headers */
#define FT_ERRORS_H FT2_PUBLIC_FILE(fterrors.h)
#define FT_SYSTEM_H FT2_PUBLIC_FILE(ftsystem.h)
#define FT_IMAGE_H FT2_PUBLIC_FILE(ftimage.h)
#define FT_TYPES_H FT2_PUBLIC_FILE(fttypes.h)
#define FT_FREETYPE_H FT2_PUBLIC_FILE(freetype.h)
#define FT_GLYPH_H FT2_PUBLIC_FILE(ftglyph.h)
#define FT_BBOX_H FT2_PUBLIC_FILE(ftbbox.h)
#define FT_CACHE_H FT2_PUBLIC_FILE(ftcache.h)
#define FT_LIST_H FT2_PUBLIC_FILE(ftlist.h)
#define FT_MAC_H FT2_PUBLIC_FILE(ftmac.h)
#define FT_MULTIPLE_MASTERS_H FT2_PUBLIC_FILE(ftmm.h)
#define FT_MODULE_H FT2_PUBLIC_FILE(ftmodule.h)
#define FT_NAMES_H FT2_PUBLIC_FILE(ftnames.h)
#define FT_OUTLINE_H FT2_PUBLIC_FILE(ftoutln.h)
#define FT_RENDER_H FT2_PUBLIC_FILE(ftrender.h)
#define FT_SYNTHESIS_H FT2_PUBLIC_FILE(ftsynth.h)
#define FT_TYPE1_TABLES_H FT2_PUBLIC_FILE(t1tables.h)
#define FT_TRUETYPE_NAMES_H FT2_PUBLIC_FILE(ttnameid.h)
#define FT_TRUETYPE_TABLES_H FT2_PUBLIC_FILE(tttables.h)
#define FT_TRUETYPE_TAGS_H FT2_PUBLIC_FILE(tttags.h)
#define FT_ERRORS_H FT2_PUBLIC_FILE( fterrors.h )
#define FT_SYSTEM_H FT2_PUBLIC_FILE( ftsystem.h )
#define FT_IMAGE_H FT2_PUBLIC_FILE( ftimage.h )
#define FT_TYPES_H FT2_PUBLIC_FILE( fttypes.h )
#define FT_FREETYPE_H FT2_PUBLIC_FILE( freetype.h )
#define FT_GLYPH_H FT2_PUBLIC_FILE( ftglyph.h )
#define FT_BBOX_H FT2_PUBLIC_FILE( ftbbox.h )
#define FT_CACHE_H FT2_PUBLIC_FILE( ftcache.h )
#define FT_LIST_H FT2_PUBLIC_FILE( ftlist.h )
#define FT_MAC_H FT2_PUBLIC_FILE( ftmac.h )
#define FT_MULTIPLE_MASTERS_H FT2_PUBLIC_FILE( ftmm.h )
#define FT_MODULE_H FT2_PUBLIC_FILE( ftmodule.h )
#define FT_NAMES_H FT2_PUBLIC_FILE( ftnames.h )
#define FT_OUTLINE_H FT2_PUBLIC_FILE( ftoutln.h )
#define FT_RENDER_H FT2_PUBLIC_FILE( ftrender.h )
#define FT_SYNTHESIS_H FT2_PUBLIC_FILE( ftsynth.h )
#define FT_TYPE1_TABLES_H FT2_PUBLIC_FILE( t1tables.h )
#define FT_TRUETYPE_NAMES_H FT2_PUBLIC_FILE( ttnameid.h )
#define FT_TRUETYPE_TABLES_H FT2_PUBLIC_FILE( tttables.h )
#define FT_TRUETYPE_TAGS_H FT2_PUBLIC_FILE( tttags.h )
/* now include internal headers definitions from <freetype/internal/...> */
#include FT2_INTERNAL_FILE(internal.h)
#include FT2_INTERNAL_FILE( internal.h )
#endif /* __FT2_BUILD_H__ */
......
......@@ -23,6 +23,7 @@
#include <ft2build.h>
#include FT_SYSTEM_H
#include FT_IMAGE_H
#include <stddef.h>
......
......@@ -18,39 +18,37 @@
/*************************************************************************/
/* */
/* This file is automatically included by `ftbuild.h'. */
/* This file is automatically included by `ft2build.h'. */
/* Do not include it manually! */
/* */
/*************************************************************************/
/* 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 )
#define FT_INTERNAL_MEMORY_H FT2_INTERNAL_FILE( ftmemory.h )
#define FT_INTERNAL_EXTENSION_H FT2_INTERNAL_FILE( ftextend.h )
#define FT_INTERNAL_DEBUG_H FT2_INTERNAL_FILE( ftdebug.h )
#define FT_INTERNAL_CALC_H FT2_INTERNAL_FILE( ftcalc.h )
#define FT_INTERNAL_DRIVER_H FT2_INTERNAL_FILE( ftdriver.h )
#define FT_INTERNAL_EXTEND_H FT2_INTERNAL_FILE( ftextend.h )
#define FT_INTERNAL_OBJECTS_H FT2_INTERNAL_FILE(ftobjs.h)
#define FT_INTERNAL_STREAM_H FT2_INTERNAL_FILE(ftstream.h)
#define FT_INTERNAL_MEMORY_H FT2_INTERNAL_FILE(ftmemory.h)
#define FT_INTERNAL_EXTENSION_H FT2_INTERNAL_FILE(ftextend.h)
#define FT_INTERNAL_DEBUG_H FT2_INTERNAL_FILE(ftdebug.h)
#define FT_INTERNAL_CALC_H FT2_INTERNAL_FILE(ftcalc.h)
#define FT_INTERNAL_DRIVER_H FT2_INTERNAL_FILE(ftdriver.h)
#define FT_INTERNAL_EXTEND_H FT2_INTERNAL_FILE(ftextend.h)
#define FT_INTERNAL_SFNT_H FT2_INTERNAL_FILE( sfnt.h )
#define FT_INTERNAL_SFNT_H FT2_INTERNAL_FILE(sfnt.h)
#define FT_INTERNAL_TRUETYPE_TYPES_H FT2_INTERNAL_FILE( tttypes.h )
#define FT_INTERNAL_TRUETYPE_ERRORS_H FT2_INTERNAL_FILE( tterrors.h )
#define FT_INTERNAL_TRUETYPE_TYPES_H FT2_INTERNAL_FILE(tttypes.h)
#define FT_INTERNAL_TRUETYPE_ERRORS_H FT2_INTERNAL_FILE(tterrors.h)
#define FT_INTERNAL_TYPE1_ERRORS_H FT2_INTERNAL_FILE( t1errors.h )
#define FT_INTERNAL_TYPE1_TYPES_H FT2_INTERNAL_FILE( t1types.h )
#define FT_INTERNAL_TYPE1_ERRORS_H FT2_INTERNAL_FILE(t1errors.h)
#define FT_INTERNAL_TYPE1_TYPES_H FT2_INTERNAL_FILE(t1types.h)
#define FT_INTERNAL_CFF_ERRORS_H FT2_INTERNAL_FILE( t2errors.h )
#define FT_INTERNAL_CFF_TYPES_H FT2_INTERNAL_FILE( t2types.h )
#define FT_INTERNAL_CFF_ERRORS_H FT2_INTERNAL_FILE(t2errors.h)
#define FT_INTERNAL_CFF_TYPES_H FT2_INTERNAL_FILE(t2types.h)
#define FT_INTERNAL_POSTSCRIPT_NAMES_H FT2_INTERNAL_FILE( psnames.h )
#define FT_INTERNAL_POSTSCRIPT_AUX_H FT2_INTERNAL_FILE( psaux.h )
#define FT_INTERNAL_POSTSCRIPT_NAMES_H FT2_INTERNAL_FILE(psnames.h)
#define FT_INTERNAL_POSTSCRIPT_AUX_H FT2_INTERNAL_FILE(psaux.h)
#define FT_INTERNAL_AUTOHINT_H FT2_INTERNAL_FILE(autohint.h)
#define FT_INTERNAL_FNT_TYPES_H FT2_INTERNAL_FILE(fnttypes.h)
#define FT_INTERNAL_AUTOHINT_H FT2_INTERNAL_FILE( autohint.h )
#define FT_INTERNAL_FNT_TYPES_H FT2_INTERNAL_FILE( fnttypes.h )
/* END */
......@@ -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 */
......@@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahangles.h)
#include FT_SOURCE_FILE( autohint, ahangles.h )
/* the following table has been automatically generated with */
......
......@@ -26,7 +26,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE(autohint,ahtypes.h)
#include FT_SOURCE_FILE( autohint, ahtypes.h )
FT_BEGIN_HEADER
......
......@@ -20,8 +20,8 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahglobal.h)
#include FT_SOURCE_FILE(autohint,ahglyph.h)
#include FT_SOURCE_FILE( autohint, ahglobal.h )
#include FT_SOURCE_FILE( autohint, ahglyph.h )
#define MAX_TEST_CHARACTERS 12
......
......@@ -25,7 +25,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahtypes.h)
#include FT_SOURCE_FILE( autohint, ahtypes.h )
#include FT_INTERNAL_OBJECTS_H
......
......@@ -21,9 +21,9 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahglyph.h)
#include FT_SOURCE_FILE(autohint,ahangles.h)
#include FT_SOURCE_FILE(autohint,ahglobal.h)
#include FT_SOURCE_FILE( autohint, ahglyph.h )
#include FT_SOURCE_FILE( autohint, ahangles.h )
#include FT_SOURCE_FILE( autohint, ahglobal.h )
#include <stdio.h>
......
......@@ -25,7 +25,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahtypes.h)
#include FT_SOURCE_FILE( autohint, ahtypes.h )
FT_BEGIN_HEADER
......
......@@ -20,9 +20,9 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahhint.h)
#include FT_SOURCE_FILE(autohint,ahglyph.h)
#include FT_SOURCE_FILE(autohint,ahangles.h)
#include FT_SOURCE_FILE( autohint, ahhint.h )
#include FT_SOURCE_FILE( autohint, ahglyph.h )
#include FT_SOURCE_FILE( autohint, ahangles.h )
#include FT_OUTLINE_H
......
......@@ -24,7 +24,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahglobal.h)
#include FT_SOURCE_FILE( autohint, ahglobal.h )
FT_BEGIN_HEADER
......
......@@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_MODULE_H
#include FT_SOURCE_FILE(autohint,ahhint.h)
#include FT_SOURCE_FILE( autohint, ahhint.h )
typedef struct FT_AutoHinterRec_
......
......@@ -33,7 +33,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H /* for ALLOC_ARRAY() and FREE() */
#include FT_SOURCE_FILE(autohint,ahoptim.h)
#include FT_SOURCE_FILE( autohint, ahoptim.h )
/* define this macro to use brute force optimisation -- this is slow, */
......
......@@ -24,7 +24,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahtypes.h)
#include FT_SOURCE_FILE( autohint, ahtypes.h )
FT_BEGIN_HEADER
......
......@@ -26,7 +26,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE(autohint,ahloader.h)
#include FT_SOURCE_FILE( autohint, ahloader.h )
#define xxAH_DEBUG
......
......@@ -22,11 +22,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahangles.c)
#include FT_SOURCE_FILE(autohint,ahglyph.c)
#include FT_SOURCE_FILE(autohint,ahglobal.c)