re: FYI: upcoming xsrc updates

[Iain Hibbert <plunky%rya-online.net@localhost>]

On Thu, 25 Nov 2010, matthew green wrote:

> > > /var/cvs/NetBSD-current/xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/xf86x86emu.c:
> > >  In function 'xf86Int10ExecSetup':
> > > /var/cvs/NetBSD-current/xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/xf86x86emu.c:54:
> > >  warning: initialization from incompatible pointer type
>
> this one is being looked at; i have a hack for it, but there may be
> a better way...

The problem is that there are multiple types scattered around, almost but
not quite the same (int vs long even though they are both 4 bytes).. the
patch below fixes it for me on i386

iain

Index: external/mit/xproto/dist/Xmd.h
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xproto/dist/Xmd.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Xmd.h
--- external/mit/xproto/dist/Xmd.h      8 Nov 2009 10:19:29 -0000       1.1.1.2
+++ external/mit/xproto/dist/Xmd.h      24 Nov 2010 21:06:52 -0000
@@ -128,7 +128,7 @@
 typedef unsigned long CARD64;
 typedef unsigned int CARD32;
 # else
-typedef unsigned long CARD32;
+typedef unsigned int CARD32;
 # endif
 # if !defined(WORD64) && !defined(LONG64)
 typedef unsigned long long CARD64;
Index: external/mit/xorg-server/dist/exa/exa_glyphs.c
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xorg-server/dist/exa/exa_glyphs.c,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 exa_glyphs.c
--- external/mit/xorg-server/dist/exa/exa_glyphs.c      23 Nov 2010 05:21:02 
-0000      1.1.1.3
+++ external/mit/xorg-server/dist/exa/exa_glyphs.c      24 Nov 2010 21:06:48 
-0000
@@ -157,7 +157,7 @@
     PictFormatPtr pPictFormat;
     PixmapPtr pPixmap;
     PicturePtr pPicture;
-    CARD32 component_alpha;
+    XID component_alpha;
     int height;
     int i;
     int        error;
@@ -711,7 +711,7 @@
     GlyphPtr   glyph;
     int                error;
     BoxRec     extents = {0, 0, 0, 0};
-    CARD32     component_alpha;
+    XID                component_alpha;
     ExaGlyphBuffer buffer;

     if (maskFormat)