Attachment 5680 Details for Bug 6924 – Patch to restore ABI on 64-bit platforms.

[patch] Patch to restore ABI on 64-bit platforms.

xorg-64bit-padding.patch (text/plain), 3.34 KB, created by Andy Ritger on 2006-05-19 16:59:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Ritger

Created: 2006-05-19 16:59:08 UTC

Size: 3.34 KB

patch

obsolete

>Index: dix/colormap.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/dix/colormap.c,v
>retrieving revision 1.12
>diff -u -r1.12 colormap.c
>--- dix/colormap.c	15 Feb 2006 20:44:12 -0000	1.12
>+++ dix/colormap.c	17 May 2006 23:55:15 -0000
>@@ -280,6 +280,9 @@
>     pmap = (ColormapPtr) xalloc(sizebytes);
>     if (!pmap)
> 	return (BadAlloc);
>+#ifdef _XSERVER64
>+    pmap->pad2 = 0;
>+#endif
>     pmap->red = (EntryPtr)((char *)pmap + sizeof(ColormapRec));    
>     sizebytes = size * sizeof(Entry);
>     pmap->clientPixelsRed = (Pixel **)((char *)pmap->red + sizebytes);
>Index: dix/pixmap.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/dix/pixmap.c,v
>retrieving revision 1.9
>diff -u -r1.9 pixmap.c
>--- dix/pixmap.c	15 Feb 2006 20:44:12 -0000	1.9
>+++ dix/pixmap.c	17 May 2006 23:55:15 -0000
>@@ -141,5 +141,10 @@
> #else
>     pPixmap = (PixmapPtr)xalloc(sizeof(PixmapRec) + pixDataSize);
> #endif
>+
>+#ifdef _XSERVER64
>+    if(pPixmap) pPixmap->drawable.pad1 = 0;
>+#endif
>+
>     return pPixmap;
> }
>Index: dix/window.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/dix/window.c,v
>retrieving revision 1.17
>diff -u -r1.17 window.c
>--- dix/window.c	31 Mar 2006 17:39:35 -0000	1.17
>+++ dix/window.c	17 May 2006 23:55:15 -0000
>@@ -384,6 +384,9 @@
> 	    else
> 		ppriv->ptr = (pointer)NULL;
> 	}
>+#if _XSERVER64
>+        pWin->drawable.pad1 = 0;
>+#endif
>     }
>     return pWin;
> }
>Index: include/colormapst.h
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/include/colormapst.h,v
>retrieving revision 1.4
>diff -u -r1.4 colormapst.h
>--- include/colormapst.h	30 Mar 2006 18:48:11 -0000	1.4
>+++ include/colormapst.h	17 May 2006 23:55:16 -0000
>@@ -49,6 +49,8 @@
> #ifndef CMAPSTRUCT_H
> #define CMAPSTRUCT_H 1
> 
>+#include <X11/Xarch.h>
>+
> #include "colormap.h"
> #include "screenint.h"
> 
>@@ -97,7 +99,17 @@
> {
>     VisualPtr	pVisual;
>     short	class;		/* PseudoColor or DirectColor */
>+#if defined(_XSERVER64)
>+    short	pad0;
>+    XID		pad1;
>+#if X_BYTE_ORDER == X_BIG_ENDIAN
>+    XID		pad2;
>+#endif
>+#endif
>     XID		mid;		/* client's name for colormap */
>+#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
>+    XID		pad2;
>+#endif
>     ScreenPtr	pScreen;	/* screen map is associated with */
>     short	flags;		/* 1 = IsDefault
> 				 * 2 = AllAllocated */
>Index: include/pixmapstr.h
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/include/pixmapstr.h,v
>retrieving revision 1.6
>diff -u -r1.6 pixmapstr.h
>--- include/pixmapstr.h	30 Mar 2006 18:48:11 -0000	1.6
>+++ include/pixmapstr.h	17 May 2006 23:55:16 -0000
>@@ -49,6 +49,7 @@
> 
> #ifndef PIXMAPSTRUCT_H
> #define PIXMAPSTRUCT_H
>+#include <X11/Xarch.h>
> #include "pixmap.h"
> #include "screenint.h"
> #include "regionstr.h"
>@@ -58,7 +59,16 @@
>     unsigned char	class;	/* specific to type */
>     unsigned char	depth;
>     unsigned char	bitsPerPixel;
>+#if defined(_XSERVER64)
>+    XID			pad0;
>+#if X_BYTE_ORDER == X_BIG_ENDIAN
>+    XID			pad1;
>+#endif
>+#endif
>     XID			id;	/* resource id */
>+#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
>+    XID			pad1;
>+#endif
>     short		x;	/* window: screen absolute, pixmap: 0 */
>     short		y;	/* window: screen absolute, pixmap: 0 */
>     unsigned short	width;

Actions: View | Splinter Review

Attachments on bug 6924: 5680

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.