diff -r 5dc02b23752f -r 3e2da88830cd src/gui/painting/qrasterdefs_p.h
--- a/src/gui/painting/qrasterdefs_p.h	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/gui/painting/qrasterdefs_p.h	Wed Aug 18 10:37:55 2010 +0300
@@ -81,7 +81,6 @@
 
 QT_FT_BEGIN_HEADER
 
-
   /*************************************************************************/
   /*                                                                       */
   /* <Section>                                                             */
@@ -837,7 +836,7 @@
   /*    A handle (pointer) to a raster object.  Each object can be used    */
   /*    independently to convert an outline into a bitmap or pixmap.       */
   /*                                                                       */
-  typedef struct QT_FT_RasterRec_*  QT_FT_Raster;
+  typedef struct TRaster_ *QT_FT_Raster;
 
 
   /*************************************************************************/
@@ -1118,8 +1117,7 @@
   /*    ignored by a given raster implementation.                          */
   /*                                                                       */
   typedef int
-  (*QT_FT_Raster_NewFunc)( void*       memory,
-                        QT_FT_Raster*  raster );
+  (*QT_FT_Raster_NewFunc)( QT_FT_Raster*  raster );
 
 #define  QT_FT_Raster_New_Func    QT_FT_Raster_NewFunc