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/raster | |
| 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/raster')
| -rw-r--r-- | src/raster/ftraster.c | 8 | ||||
| -rw-r--r-- | src/raster/ftraster.h | 2 | ||||
| -rw-r--r-- | src/raster/ftrend1.c | 6 | ||||
| -rw-r--r-- | src/raster/ftrend1.h | 2 | ||||
| -rw-r--r-- | src/raster/rasterrs.h | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 35655a634..a633ae1a8 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -64,8 +64,8 @@ #include <ft2build.h> #include "ftraster.h" -#include FT_INTERNAL_CALC_H /* for FT_MulDiv and FT_MulDiv_No_Round */ -#include FT_OUTLINE_H /* for FT_Outline_Get_CBox */ +#include <freetype/internal/ftcalc.h> /* for FT_MulDiv and FT_MulDiv_No_Round */ +#include <freetype/ftoutln.h> /* for FT_Outline_Get_CBox */ #endif /* !STANDALONE_ */ @@ -226,8 +226,8 @@ #else /* !STANDALONE_ */ -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H /* for FT_TRACE, FT_ERROR, and FT_THROW */ +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> /* for FT_TRACE, FT_ERROR, and FT_THROW */ #include "rasterrs.h" diff --git a/src/raster/ftraster.h b/src/raster/ftraster.h index 833d30f23..1e5a725e9 100644 --- a/src/raster/ftraster.h +++ b/src/raster/ftraster.h @@ -22,7 +22,7 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include FT_IMAGE_H +#include <freetype/ftimage.h> FT_BEGIN_HEADER diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c index 944279a8d..cdb2cfc3e 100644 --- a/src/raster/ftrend1.c +++ b/src/raster/ftrend1.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H -#include FT_OUTLINE_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftobjs.h> +#include <freetype/ftoutln.h> #include "ftrend1.h" #include "ftraster.h" diff --git a/src/raster/ftrend1.h b/src/raster/ftrend1.h index dc972b1bc..caeaa1873 100644 --- a/src/raster/ftrend1.h +++ b/src/raster/ftrend1.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_RENDER_H +#include <freetype/ftrender.h> FT_BEGIN_HEADER diff --git a/src/raster/rasterrs.h b/src/raster/rasterrs.h index 379e1d3e8..a29651a6c 100644 --- a/src/raster/rasterrs.h +++ b/src/raster/rasterrs.h @@ -26,7 +26,7 @@ #ifndef RASTERRS_H_ #define RASTERRS_H_ -#include FT_MODULE_ERRORS_H +#include <freetype/ftmoderr.h> #undef FTERRORS_H_ @@ -34,7 +34,7 @@ #define FT_ERR_PREFIX Raster_Err_ #define FT_ERR_BASE FT_Mod_Err_Raster -#include FT_ERRORS_H +#include <freetype/fterrors.h> #endif /* RASTERRS_H_ */ |