[freetype2-demos] master 9b7d6de: Fix compiler warnings.

[Werner LEMBERG]

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

    Fix compiler warnings.
    
    * src/ftcommon.c, src/ftcommon.h
    (FTDemo_Event_{Cff,Type1,T1cid}_Hinting_Engine_Change): Change
    return type to `int'.
    
    * src/ftdiff.c (HINTING_ENGINE_MAX): Removed.
    * src/ftgrid.c, src/ftmulti.c, src/ftview.c (N_HINTING_ENGINES):
    Removed.
---
 ChangeLog      | 12 ++++++++++++
 src/ftcommon.c |  6 +++---
 src/ftcommon.h |  6 +++---
 src/ftdiff.c   |  2 --
 src/ftgrid.c   |  2 --
 src/ftmulti.c  |  2 --
 src/ftview.c   |  3 ---
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c8f08a..46824e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2017-12-27  Werner Lemberg  <address@hidden>
+
+       Fix compiler warnings.
+
+       * src/ftcommon.c, src/ftcommon.h
+       (FTDemo_Event_{Cff,Type1,T1cid}_Hinting_Engine_Change): Change
+       return type to `int'.
+
+       * src/ftdiff.c (HINTING_ENGINE_MAX): Removed.
+       * src/ftgrid.c, src/ftmulti.c, src/ftview.c (N_HINTING_ENGINES):
+       Removed.
+
 2017-12-16  Alexei Podtelezhnikov  <address@hidden>
 
        * bin/.gitignore: Ignore almost everything.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 24b92c9..9d00ab9 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -1689,7 +1689,7 @@
   }
 
 
-  unsigned int
+  int
   FTDemo_Event_Cff_Hinting_Engine_Change( FT_Library     library,
                                           unsigned int*  current,
                                           unsigned int   delta )
@@ -1717,7 +1717,7 @@
   }
 
 
-  unsigned int
+  int
   FTDemo_Event_Type1_Hinting_Engine_Change( FT_Library     library,
                                             unsigned int*  current,
                                             unsigned int   delta )
@@ -1745,7 +1745,7 @@
   }
 
 
-  unsigned int
+  int
   FTDemo_Event_T1cid_Hinting_Engine_Change( FT_Library     library,
                                             unsigned int*  current,
                                             unsigned int   delta )
diff --git a/src/ftcommon.h b/src/ftcommon.h
index f7a00b5..c43dff3 100644
--- a/src/ftcommon.h
+++ b/src/ftcommon.h
@@ -353,15 +353,15 @@
   FTDemo_Make_Encoding_Tag( const char*  s );
 
 
-  unsigned int
+  int
   FTDemo_Event_Cff_Hinting_Engine_Change( FT_Library     library,
                                           unsigned int*  current,
                                           unsigned int   delta );
-  unsigned int
+  int
   FTDemo_Event_Type1_Hinting_Engine_Change( FT_Library     library,
                                             unsigned int*  current,
                                             unsigned int   delta );
-  unsigned int
+  int
   FTDemo_Event_T1cid_Hinting_Engine_Change( FT_Library     library,
                                             unsigned int*  current,
                                             unsigned int   delta );
diff --git a/src/ftdiff.c b/src/ftdiff.c
index 96ee9cb..e8d3969 100644
--- a/src/ftdiff.c
+++ b/src/ftdiff.c
@@ -170,8 +170,6 @@
     "native hinter"
   };
 
-#define HINTING_ENGINE_MAX  2
-
   /** RENDER STATE **/
 
   typedef struct  ColumnStateRec_
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 19ea56f..4975e8b 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -43,8 +43,6 @@
 #define snprintf  _snprintf
 #endif
 
-#define N_HINTING_ENGINES  2
-
 
 #ifdef FT_DEBUG_AUTOFIT
   /* these variables, structures, and declarations are for  */
diff --git a/src/ftmulti.c b/src/ftmulti.c
index e6f9309..4b45dee 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -36,8 +36,6 @@
 #define  MAXPTSIZE    500               /* dtp */
 #define  MAX_MM_AXES    6
 
-#define N_HINTING_ENGINES  2
-
   /* definitions in ftcommon.c */
   unsigned int
   FTDemo_Event_Cff_Hinting_Engine_Change( FT_Library     library,
diff --git a/src/ftview.c b/src/ftview.c
index d6cd8f9..5856869 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -67,9 +67,6 @@
 #endif
 
 
-#define N_HINTING_ENGINES  2
-
-
   /* omit LCD_MODE_LIGHT_SUBPIXEL; we don't need it in this application */
   static int  lcd_modes[] =
   {