From cf6bc2e22d9598f574604ecdbbd1cde5bb7cd2f2 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Thu, 2 Nov 2000 15:14:38 +0000
Subject: [PATCH] More C++ fixes.

---
 src/cache/ftcimage.c    |  4 ++--
 src/truetype/ttinterp.c | 12 ++++++------
 src/type1/t1load.c      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 294c64820..b0c6abb2b 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -96,7 +96,7 @@
                                      &face, &size );
     if ( !error )
     {
-      FT_UInt  glyph_index = node->root.glyph_index;
+      FT_UInt  gindex = node->root.glyph_index;
       FT_UInt  load_flags  = FT_LOAD_DEFAULT;
       FT_UInt  image_type  = imageset->description.image_type;
 
@@ -126,7 +126,7 @@
       if ( image_type & ftc_image_flag_autohinted )
         load_flags |= FT_LOAD_FORCE_AUTOHINT;
 
-      error = FT_Load_Glyph( face, glyph_index, load_flags );
+      error = FT_Load_Glyph( face, gindex, load_flags );
       if ( !error )
       {
         if ( face->glyph->format == ft_glyph_format_bitmap  ||
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 9dc0c190a..b18732dac 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -1278,21 +1278,21 @@
   /*************************************************************************/
 
 
-  static
+  LOCAL_FUNC_X
   FT_F26Dot6  Read_CVT( EXEC_OP_ FT_ULong  index )
   {
     return CUR.cvt[index];
   }
 
 
-  static
+  LOCAL_FUNC_X
   FT_F26Dot6  Read_CVT_Stretched( EXEC_OP_ FT_ULong  index )
   {
     return TT_MULFIX( CUR.cvt[index], CURRENT_Ratio() );
   }
 
 
-  static
+  LOCAL_FUNC_X
   void  Write_CVT( EXEC_OP_ FT_ULong    index,
                             FT_F26Dot6  value )
   {
@@ -1300,7 +1300,7 @@
   }
 
 
-  static
+  LOCAL_FUNC_X
   void  Write_CVT_Stretched( EXEC_OP_ FT_ULong    index,
                                       FT_F26Dot6  value )
   {
@@ -1308,7 +1308,7 @@
   }
 
 
-  static
+  LOCAL_FUNC_X
   void  Move_CVT( EXEC_OP_ FT_ULong    index,
                            FT_F26Dot6  value )
   {
@@ -1316,7 +1316,7 @@
   }
 
 
-  static
+  LOCAL_FUNC_X
   void  Move_CVT_Stretched( EXEC_OP_ FT_ULong    index,
                                      FT_F26Dot6  value )
   {
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 7bb4b25de..787aab2e0 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -972,7 +972,7 @@
       /* We need to `zero' out encoding_table.elements          */
       for ( n = 0; n < count; n++ )
       {
-        char*  notdef = ".notdef";
+        char*  notdef = (char *)".notdef";
 
 
         T1_Add_Table( char_table, n, notdef, 8 );
@@ -1342,7 +1342,7 @@
 
       /* 0 333 hsbw endchar                                      */
       FT_Byte  notdef_glyph[] = {0x8B, 0xF7, 0xE1, 0x0D, 0x0E};
-      char*    notdef_name    = ".notdef";
+      char*    notdef_name    = (char *)".notdef";
 
 
       error = T1_Add_Table( name_table, n,