diff options
| author | David Turner <david@freetype.org> | 2020-06-08 13:31:55 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2020-06-08 13:31:55 +0200 |
| commit | e13391333f501967db8823025ce8c63259b5d57e (patch) | |
| tree | 64cddc61043a9db91168f734bdba8211357168ce /src/pcf | |
| parent | 9e6e903cc4f6f2de86356d551e74eace75927c31 (diff) | |
| download | freetype2-e13391333f501967db8823025ce8c63259b5d57e.tar.gz | |
Make macros for header file names optional.
We no longer have to take care of the 8.3 file name limit; this
allows us (a) to introduce longer, meaningful file names, and (b) to
avoid macro names in `#include' lines altogether since some
compilers (most notably Visual C++) doesn't support this properly.
*/*: Replace
#include FOO_H
with
#include <freetype/foo.h>
or something similar. Also update the documentation.
Diffstat (limited to 'src/pcf')
| -rw-r--r-- | src/pcf/pcf.h | 4 | ||||
| -rw-r--r-- | src/pcf/pcfdrivr.c | 26 | ||||
| -rw-r--r-- | src/pcf/pcfdrivr.h | 2 | ||||
| -rw-r--r-- | src/pcf/pcferror.h | 4 | ||||
| -rw-r--r-- | src/pcf/pcfread.c | 6 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h index 33be4bcd8..13380303b 100644 --- a/src/pcf/pcf.h +++ b/src/pcf/pcf.h @@ -30,8 +30,8 @@ THE SOFTWARE. #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H -#include FT_INTERNAL_STREAM_H +#include <freetype/internal/ftdrv.h> +#include <freetype/internal/ftstream.h> FT_BEGIN_HEADER diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c index b39592c79..c3ab0a445 100644 --- a/src/pcf/pcfdrivr.c +++ b/src/pcf/pcfdrivr.c @@ -27,15 +27,15 @@ THE SOFTWARE. #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_OBJECTS_H -#include FT_GZIP_H -#include FT_LZW_H -#include FT_BZIP2_H -#include FT_ERRORS_H -#include FT_BDF_H -#include FT_TRUETYPE_IDS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/ftgzip.h> +#include <freetype/ftlzw.h> +#include <freetype/ftbzip2.h> +#include <freetype/fterrors.h> +#include <freetype/ftbdf.h> +#include <freetype/ttnameid.h> #include "pcf.h" #include "pcfdrivr.h" @@ -47,10 +47,10 @@ THE SOFTWARE. #undef FT_COMPONENT #define FT_COMPONENT pcfread -#include FT_SERVICE_BDF_H -#include FT_SERVICE_FONT_FORMAT_H -#include FT_SERVICE_PROPERTIES_H -#include FT_DRIVER_H +#include <freetype/internal/services/svbdf.h> +#include <freetype/internal/services/svfntfmt.h> +#include <freetype/internal/services/svprop.h> +#include <freetype/ftdriver.h> /************************************************************************** diff --git a/src/pcf/pcfdrivr.h b/src/pcf/pcfdrivr.h index 73db0823d..dac2f2238 100644 --- a/src/pcf/pcfdrivr.h +++ b/src/pcf/pcfdrivr.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define PCFDRIVR_H_ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftdrv.h> FT_BEGIN_HEADER diff --git a/src/pcf/pcferror.h b/src/pcf/pcferror.h index 2e69d1d21..8b9e9902a 100644 --- a/src/pcf/pcferror.h +++ b/src/pcf/pcferror.h @@ -25,7 +25,7 @@ #ifndef PCFERROR_H_ #define PCFERROR_H_ -#include FT_MODULE_ERRORS_H +#include <freetype/ftmoderr.h> #undef FTERRORS_H_ @@ -33,7 +33,7 @@ #define FT_ERR_PREFIX PCF_Err_ #define FT_ERR_BASE FT_Mod_Err_PCF -#include FT_ERRORS_H +#include <freetype/fterrors.h> #endif /* PCFERROR_H_ */ diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 2ffe22d71..7cc33a36a 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -27,9 +27,9 @@ THE SOFTWARE. #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftstream.h> +#include <freetype/internal/ftobjs.h> #include "pcf.h" #include "pcfread.h" |