diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | include/colormapst.h | 2 | ||||
| -rw-r--r-- | include/pixmapstr.h | 2 | ||||
| -rw-r--r-- | mi/miwideline.c | 9 |
4 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,14 @@ +2006-03-30 Egbert Eich <eich_at_freedesktop_dot_org> + + * include/colormapst.h: + * include/pixmapstr.h: + * mi/miwideline.c: (miFillRectPolyHelper), (miLineArc): + Fixes for some vsw4 failures on 64bit BE platforms such as + PPC64 and s390x. Provided by Hong Bo Peng of IBM (slightly + modified). Patches try to resolve some of the careless + mixtures of ulong and uint (which are different size on + 64bit). Bugzilla #6438. + 2006-03-29 Kristian Høgsberg <krh@redhat.com> * GL/glx/indirect_dispatch.c: diff --git a/include/colormapst.h b/include/colormapst.h index 5ceee9870..d2422ea85 100644 --- a/include/colormapst.h +++ b/include/colormapst.h @@ -97,7 +97,7 @@ typedef struct _ColormapRec { VisualPtr pVisual; short class; /* PseudoColor or DirectColor */ - long mid; /* client's name for colormap */ + XID mid; /* client's name for colormap */ ScreenPtr pScreen; /* screen map is associated with */ short flags; /* 1 = IsDefault * 2 = AllAllocated */ diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 22a1f1025..272ce6869 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -58,7 +58,7 @@ typedef struct _Drawable { unsigned char class; /* specific to type */ unsigned char depth; unsigned char bitsPerPixel; - unsigned long id; /* resource id */ + XID id; /* resource id */ short x; /* window: screen absolute, pixmap: 0 */ short y; /* window: screen absolute, pixmap: 0 */ unsigned short width; diff --git a/mi/miwideline.c b/mi/miwideline.c index cd65c7792..39b147d99 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -121,7 +121,8 @@ miFillPolyHelper (pDrawable, pGC, pixel, spanData, y, overall_height, oldPixel = pGC->fgPixel; if (pixel != oldPixel) { - DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE); + XID tmpPixel = (XID)pixel; + DoChangeGC (pGC, GCForeground, tmpPixel, FALSE); ValidateGC (pDrawable, pGC); } } @@ -219,7 +220,8 @@ miFillRectPolyHelper ( oldPixel = pGC->fgPixel; if (pixel != oldPixel) { - DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE); + XID tmpPixel = (XID)pixel; + DoChangeGC (pGC, GCForeground, tmpPixel, FALSE); ValidateGC (pDrawable, pGC); } (*pGC->ops->PolyFillRect) (pDrawable, pGC, 1, &rect); @@ -1070,7 +1072,8 @@ miLineArc ( oldPixel = pGC->fgPixel; if (pixel != oldPixel) { - DoChangeGC(pGC, GCForeground, (XID *)&pixel, FALSE); + XID tmpPixel = (XID)pixel; + DoChangeGC(pGC, GCForeground, tmpPixel, FALSE); ValidateGC (pDraw, pGC); } } |