Dmitry Timoshkov : winex11.drv: Fix compilation warnings in 64-bit mode.

Alexandre Julliard julliard at wine.codeweavers.com
Wed May 30 08:56:54 CDT 2007


Module: wine
Branch: master
Commit: 4978194fde45fb94df8c4eb0f43cabfad3f8d676
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4978194fde45fb94df8c4eb0f43cabfad3f8d676

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Wed May 30 17:52:11 2007 +0900

winex11.drv: Fix compilation warnings in 64-bit mode.

---

 dlls/winex11.drv/xfont.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c
index b53da7e..0ef18fc 100644
--- a/dlls/winex11.drv/xfont.c
+++ b/dlls/winex11.drv/xfont.c
@@ -2201,9 +2201,10 @@ static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x
 			{
 			   if( offset > length ||
 			       pfi->cptable >= (UINT16)X11DRV_CPTABLE_COUNT ||
-			      (int)(pfi->next) != j++ )
+			       PtrToInt(pfi->next) != j++ )
 			   {
-			       TRACE("error: offset=%ld length=%ld cptable=%d pfi->next=%d j=%d\n",(long)offset,(long)length,pfi->cptable,(int)pfi->next,j-1);
+			       TRACE("error: offset=%ld length=%ld cptable=%d pfi->next=%p j=%d\n",
+                                      (long)offset, (long)length, pfi->cptable, pfi->next, j-1);
 			       goto fail;
 			   }
 
@@ -2332,7 +2333,7 @@ static BOOL XFONT_WriteCachedMetrics( int fd, unsigned x_checksum, int x_count,
 		    fi = *pfi;
 
 		    fi.df.dfFace = NULL;
-		    fi.next = (fontInfo*)k;	/* loader checks this */
+		    fi.next = IntToPtr(k);	/* loader checks this */
 
 		    j = write( fd, &fi, sizeof(fi) );
 		    k++;




More information about the wine-cvs mailing list