[freetype2] master 663486a7a 5/6: Fix `FT_LOCAL` and `FT_LOCAL_DEF` tags.

[Werner Lemberg]

branch: master
commit 663486a7acf5c1e4dd356e84c3e11d5aa6794158
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    Fix `FT_LOCAL` and `FT_LOCAL_DEF` tags.
---
 src/autofit/afglobal.h | 2 +-
 src/autofit/afhints.c  | 2 +-
 src/autofit/afloader.h | 2 +-
 src/cid/cidobjs.c      | 2 +-
 src/pfr/pfrsbit.c      | 2 +-
 src/psaux/afmparse.c   | 2 +-
 src/pshinter/pshrec.c  | 4 ++--
 src/sfnt/ttcmap.c      | 3 ++-
 src/sfnt/ttsbit.c      | 2 +-
 9 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/autofit/afglobal.h b/src/autofit/afglobal.h
index abf9a721d..83a7c2ff1 100644
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -158,7 +158,7 @@ FT_BEGIN_HEADER
   FT_LOCAL( void )
   af_face_globals_free( AF_FaceGlobals  globals );
 
-  FT_LOCAL_DEF( FT_Bool )
+  FT_LOCAL( FT_Bool )
   af_face_globals_is_digit( AF_FaceGlobals  globals,
                             FT_UInt         gindex );
 
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index 34bb6a34f..6515af9f0 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -193,7 +193,7 @@
   /* Get new edge for given axis, direction, and position, */
   /* without initializing the edge itself.                 */
 
-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
   af_axis_hints_new_edge( AF_AxisHints  axis,
                           FT_Int        fpos,
                           AF_Direction  dir,
diff --git a/src/autofit/afloader.h b/src/autofit/afloader.h
index a3acefdae..e4e197e37 100644
--- a/src/autofit/afloader.h
+++ b/src/autofit/afloader.h
@@ -75,7 +75,7 @@ FT_BEGIN_HEADER
                         FT_UInt    gindex,
                         FT_Int32   load_flags );
 
-  FT_LOCAL_DEF( FT_Fixed )
+  FT_LOCAL( FT_Fixed )
   af_loader_compute_darkening( AF_Loader  loader,
                                FT_Face    face,
                                FT_Pos     standard_width );
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index a230fb43c..06b2139a9 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -153,7 +153,7 @@
   }
 
 
-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
   cid_size_request( FT_Size          size,
                     FT_Size_Request  req )
   {
diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c
index 8588e6093..46a988e8e 100644
--- a/src/pfr/pfrsbit.c
+++ b/src/pfr/pfrsbit.c
@@ -580,7 +580,7 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
   pfr_slot_load_bitmap( PFR_Slot  glyph,
                         PFR_Size  size,
                         FT_UInt   glyph_index,
diff --git a/src/psaux/afmparse.c b/src/psaux/afmparse.c
index e97abb09e..68f95698e 100644
--- a/src/psaux/afmparse.c
+++ b/src/psaux/afmparse.c
@@ -563,7 +563,7 @@
   }
 
 
-  FT_LOCAL( void )
+  FT_LOCAL_DEF( void )
   afm_parser_done( AFM_Parser  parser )
   {
     FT_Memory  memory = parser->memory;
diff --git a/src/pshinter/pshrec.c b/src/pshinter/pshrec.c
index 3ab2962f9..58c8cf1b4 100644
--- a/src/pshinter/pshrec.c
+++ b/src/pshinter/pshrec.c
@@ -765,7 +765,7 @@
 
 
   /* destroy hints */
-  FT_LOCAL( void )
+  FT_LOCAL_DEF( void )
   ps_hints_done( PS_Hints  hints )
   {
     FT_Memory  memory = hints->memory;
@@ -779,7 +779,7 @@
   }
 
 
-  FT_LOCAL( void )
+  FT_LOCAL_DEF( void )
   ps_hints_init( PS_Hints   hints,
                  FT_Memory  memory )
   {
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index ddc6fe5f7..820cd08e6 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -3879,13 +3879,14 @@
   }
 
 
-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
   tt_get_cmap_info( FT_CharMap    charmap,
                     TT_CMapInfo  *cmap_info )
   {
     FT_CMap        cmap  = (FT_CMap)charmap;
     TT_CMap_Class  clazz = (TT_CMap_Class)cmap->clazz;
 
+
     if ( clazz->get_cmap_info )
       return clazz->get_cmap_info( charmap, cmap_info );
     else
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 9c865e4b2..3c0695513 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -1593,7 +1593,7 @@
     return error;
   }
 
-  FT_LOCAL( FT_Error )
+  FT_LOCAL_DEF( FT_Error )
   tt_face_load_sbit_image( TT_Face              face,
                            FT_ULong             strike_index,
                            FT_UInt              glyph_index,