[freetype2] master e559578 1/3: Fix preprocessor warning.

[Werner LEMBERG]

branch: master
commit e5595784f4075a631f3d6606cecc6dad3100d642
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    Fix preprocessor warning.
    
    * devel/ftoption.h, include/freetype/config/ftoption.h: Test whether
    TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined before checking its
    value.
---
 ChangeLog                          | 8 ++++++++
 devel/ftoption.h                   | 2 ++
 include/freetype/config/ftoption.h | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0db7b3d..55733a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2017-03-17  Werner Lemberg  <address@hidden>
 
+       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  <address@hidden>
+
        `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
 
 
   /*