diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-03-17 21:34:08 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-03-17 21:34:08 +0100 |
| commit | e5595784f4075a631f3d6606cecc6dad3100d642 (patch) | |
| tree | b243b146084e6e28eca895257fd9f2b4e8166e67 | |
| parent | bffb7fe90b1a3403ee253c30974beaa8ee436567 (diff) | |
| download | freetype2-e5595784f4075a631f3d6606cecc6dad3100d642.tar.gz | |
Fix preprocessor warning.
* devel/ftoption.h, include/freetype/config/ftoption.h: Test whether
TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined before checking its
value.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | devel/ftoption.h | 2 | ||||
| -rw-r--r-- | include/freetype/config/ftoption.h | 2 |
3 files changed, 12 insertions, 0 deletions
@@ -1,5 +1,13 @@ 2017-03-17 Werner Lemberg <wl@gnu.org> + Fix preprocessor warning. + + * devel/ftoption.h, include/freetype/config/ftoption.h: Test whether + TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined before checking its + value. + +2017-03-17 Werner Lemberg <wl@gnu.org> + `make multi' fixes; compiler warnings. * src/base/ftsnames.c: Include FT_INTERNAL_DEBUG_H. diff --git a/devel/ftoption.h b/devel/ftoption.h index b8b0a8d..db661e7 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -913,6 +913,7 @@ FT_BEGIN_HEADER #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER #define TT_USE_BYTECODE_INTERPRETER +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING #if TT_CONFIG_OPTION_SUBPIXEL_HINTING & 1 #define TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY #endif @@ -921,6 +922,7 @@ FT_BEGIN_HEADER #define TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL #endif #endif +#endif /* diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 7e81fa4..ff393a8 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -922,6 +922,7 @@ FT_BEGIN_HEADER #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER #define TT_USE_BYTECODE_INTERPRETER +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING #if TT_CONFIG_OPTION_SUBPIXEL_HINTING & 1 #define TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY #endif @@ -930,6 +931,7 @@ FT_BEGIN_HEADER #define TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL #endif #endif +#endif /* |
