diff --git a/ChangeLog b/ChangeLog
index 2399828f1..19c96b2d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
         * include/freetype/internal/tttypes.h: adding comments to some of
           the TT_FaceRec fields.
 
+        * src/sfnt/ttcmap0.c (TT_Build_CMaps): removed compiler warnings
+
 2002-03-30  Werner Lemberg  <wl@gnu.org>
 
 	* include/freetype/t1tables.h (t1_blend_max): Fix typo.
diff --git a/src/sfnt/ttcmap0.c b/src/sfnt/ttcmap0.c
index 0cde8573c..b07969305 100644
--- a/src/sfnt/ttcmap0.c
+++ b/src/sfnt/ttcmap0.c
@@ -1548,10 +1548,10 @@
   FT_LOCAL_DEF( FT_Error )
   TT_Build_CMaps( TT_Face   face )
   {
-    FT_UInt          num_cmaps;
-    FT_Byte*         table = face->cmap_table;
-    FT_Byte*         limit = table + face->cmap_size;
-    FT_Byte*         p     = table;
+    FT_Byte*           table = face->cmap_table;
+    FT_Byte*           limit = table + face->cmap_size;
+    volatile FT_UInt   num_cmaps;
+    volatile FT_Byte*  p     = table;
 
     if ( p + 4 > limit )
       return FT_Err_Invalid_Table;
@@ -1580,10 +1580,10 @@
 
       if ( offset && table + offset + 2 < limit )
       {
-        FT_Byte*              cmap   = table + offset;
-        FT_UInt               format = TT_PEEK_USHORT(cmap);
-        const TT_CMap_Class*  pclazz = tt_cmap_classes;
-        TT_CMap_Class         clazz;
+        FT_Byte*                       cmap   = table + offset;
+        FT_UInt                        format = TT_PEEK_USHORT(cmap);
+        volatile const TT_CMap_Class*  pclazz = tt_cmap_classes;
+        TT_CMap_Class                  clazz;
 
         for ( ; *pclazz; pclazz++ )
         {