Index: lib/ttcache.h
===================================================================
RCS file: /cvsroot/freetype/freetype/lib/ttcache.h,v
retrieving revision 1.18
diff -u -p -r1.18 ttcache.h
--- lib/ttcache.h	15 Mar 2002 01:33:52 -0000	1.18
+++ lib/ttcache.h	14 Apr 2005 11:50:14 -0000
@@ -192,10 +192,10 @@
   Cache_Done( TCache*  cache, void*  data );
 
 #define CACHE_New( _cache, _newobj, _parent ) \
-          Cache_New( (TCache*)_cache, (void**)&_newobj, (void*)_parent )
+          Cache_New( (TCache*)(_cache), (void*)&(_newobj), (void*)(_parent) )
 
 #define CACHE_Done( _cache, _obj ) \
-          Cache_Done( (TCache*)_cache, (void*)_obj )
+          Cache_Done( (TCache*)(_cache), (void*)(_obj) )
 
 
 
Index: lib/ttmemory.h
===================================================================
RCS file: /cvsroot/freetype/freetype/lib/ttmemory.h,v
retrieving revision 1.19
diff -u -p -r1.19 ttmemory.h
--- lib/ttmemory.h	15 Mar 2002 01:33:52 -0000	1.19
+++ lib/ttmemory.h	14 Apr 2005 11:50:14 -0000
@@ -54,10 +54,10 @@
 
 
 #define MEM_Alloc( _pointer_, _size_ ) \
-  TT_Alloc( _size_, (void**)&(_pointer_) )
+  TT_Alloc( _size_, (void*)&(_pointer_) )
 
 #define MEM_Realloc( _pointer_, _size_ ) \
-  TT_Realloc( _size_, (void**)&(_pointer_) )
+  TT_Realloc( _size_, (void*)&(_pointer_) )
 
 #define ALLOC( _pointer_, _size_ ) \
   ( ( error = MEM_Alloc( _pointer_, _size_ ) ) != TT_Err_Ok )
@@ -74,7 +74,7 @@
                           (_count_) * sizeof ( _type_ ) ) ) != TT_Err_Ok )
 
 #define FREE( _pointer_ ) \
-  TT_Free( (void**)&(_pointer_) )
+  TT_Free( (void*)&(_pointer_) )
 
 
   /* Allocate a block of memory of 'Size' bytes from the heap, and */
Index: lib/extend/ftxgdef.c
===================================================================
RCS file: /cvsroot/freetype/freetype/lib/extend/ftxgdef.c,v
retrieving revision 1.14
diff -u -p -r1.14 ftxgdef.c
--- lib/extend/ftxgdef.c	19 Jan 2002 00:23:23 -0000	1.14
+++ lib/extend/ftxgdef.c	14 Apr 2005 11:50:15 -0000
@@ -142,7 +142,7 @@
     if ( !faze )
       return TT_Err_Invalid_Face_Handle;
 
-    error = TT_Extension_Get( faze, GDEF_ID, (void**)&gdef );
+    error = TT_Extension_Get( faze, GDEF_ID, (void*)&gdef );
     if ( error )
       return error;
 
Index: lib/extend/ftxgpos.c
===================================================================
RCS file: /cvsroot/freetype/freetype/lib/extend/ftxgpos.c,v
retrieving revision 1.17
diff -u -p -r1.17 ftxgpos.c
--- lib/extend/ftxgpos.c	26 Sep 2002 08:40:00 -0000	1.17
+++ lib/extend/ftxgpos.c	14 Apr 2005 11:50:15 -0000
@@ -184,7 +184,7 @@
     if ( !faze )
       return TT_Err_Invalid_Face_Handle;
 
-    error = TT_Extension_Get( faze, GPOS_ID, (void**)&gpos );
+    error = TT_Extension_Get( faze, GPOS_ID, (void*)&gpos );
     if ( error )
       return error;
 
@@ -283,7 +283,7 @@
 
           /* copy the class definition pointer into the extension structure */
 
-          error = TT_Extension_Get( faze, GDEF_ID, (void**)&gdef_reg );
+          error = TT_Extension_Get( faze, GDEF_ID, (void*)&gdef_reg );
           if ( error )
             return error;
 
Index: lib/extend/ftxgsub.c
===================================================================
RCS file: /cvsroot/freetype/freetype/lib/extend/ftxgsub.c,v
retrieving revision 1.47
diff -u -p -r1.47 ftxgsub.c
--- lib/extend/ftxgsub.c	26 Sep 2002 08:40:00 -0000	1.47
+++ lib/extend/ftxgsub.c	14 Apr 2005 11:50:16 -0000
@@ -264,7 +264,7 @@
     if ( !faze )
       return TT_Err_Invalid_Face_Handle;
 
-    error = TT_Extension_Get( faze, GSUB_ID, (void**)&gsub );
+    error = TT_Extension_Get( faze, GSUB_ID, (void*)&gsub );
     if ( error )
       return error;
 
@@ -363,7 +363,7 @@
 
           /* copy the class definition pointer into the extension structure */
 
-          error = TT_Extension_Get( faze, GDEF_ID, (void**)&gdef_reg );
+          error = TT_Extension_Get( faze, GDEF_ID, (void*)&gdef_reg );
           if ( error )
             return error;
 
Index: lib/extend/ftxkern.c
===================================================================
RCS file: /cvsroot/freetype/freetype/lib/extend/ftxkern.c,v
retrieving revision 1.27
diff -u -p -r1.27 ftxkern.c
--- lib/extend/ftxkern.c	15 Mar 2002 01:33:53 -0000	1.27
+++ lib/extend/ftxkern.c	14 Apr 2005 11:50:16 -0000
@@ -545,7 +545,7 @@
       return TT_Err_Invalid_Face_Handle;
 
     /* copy directory header */
-    error = TT_Extension_Get( faze, KERNING_ID, (void**)&kerning );
+    error = TT_Extension_Get( faze, KERNING_ID, (void*)&kerning );
     if ( !error )
       *directory = *kerning;
 
@@ -584,7 +584,7 @@
     if ( !faze )
       return TT_Err_Invalid_Face_Handle;
 
-    error = TT_Extension_Get( faze, KERNING_ID, (void**)&kern );
+    error = TT_Extension_Get( faze, KERNING_ID, (void*)&kern );
     if ( error )
       return error;
 
Index: lib/extend/ftxpost.c
===================================================================
RCS file: /cvsroot/freetype/freetype/lib/extend/ftxpost.c,v
retrieving revision 1.18
diff -u -p -r1.18 ftxpost.c
--- lib/extend/ftxpost.c	20 Jul 2002 21:24:26 -0000	1.18
+++ lib/extend/ftxpost.c	14 Apr 2005 11:50:16 -0000
@@ -404,7 +404,7 @@
     if ( !faze )
       return TT_Err_Invalid_Face_Handle;
 
-    error = TT_Extension_Get( faze, POST_ID, (void**)&post );
+    error = TT_Extension_Get( faze, POST_ID, (void*)&post );
     if ( error )
       return error;
 
@@ -494,7 +494,7 @@
     if ( index >= faze->numGlyphs )
       return TT_Err_Invalid_Glyph_Index;
 
-    error = TT_Extension_Get( faze, POST_ID, (void**)&post );
+    error = TT_Extension_Get( faze, POST_ID, (void*)&post );
     if ( error )
       return error;
 
Index: lib/extend/ftxsbit.c
===================================================================
RCS file: /cvsroot/freetype/freetype/lib/extend/ftxsbit.c,v
retrieving revision 1.19
diff -u -p -r1.19 ftxsbit.c
--- lib/extend/ftxsbit.c	19 Jan 2002 00:23:24 -0000	1.19
+++ lib/extend/ftxsbit.c	14 Apr 2005 11:50:16 -0000
@@ -1145,7 +1145,7 @@
     TT_Error  error;
 
 
-    error = TT_Extension_Get( faze, SBIT_ID, (void**)&eblc );
+    error = TT_Extension_Get( faze, SBIT_ID, (void*)&eblc );
     if ( !error )
     {
       if ( eblc->version )
@@ -1200,7 +1200,7 @@
     if ( !strike || !ins || ins->owner != faze )
       return TT_Err_Invalid_Argument;
 
-    error = TT_Extension_Get( faze, SBIT_ID, (void**)&eblc );
+    error = TT_Extension_Get( faze, SBIT_ID, (void*)&eblc );
     if ( error )
       goto Exit;