cyrix problem

[Chuck Robey]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I found a couple of problems in xf86_video_cyrix.  One is in file cyrix_accel.c,
a missing include of pciaccess.h, which comes from my /usr/X11R7.4/include, so
it's already on an existing include path, it just needs to be included, so that
pci_device is defined.

The other one might have more than one fix, and I'm not really sure about it.
In the same file (cyrix_accel.c) I'm getting an error from the include of
cyrix.h ... it seems that  pciVideoPtr  isn't defined (t's an alias for
pci_device), I *think* it would have been found in cyrix_pcirename.h (like all
of those other whatever_pcirename.h files).  There are a TON of errors that are
from there, after I stuck in that include of pciaccess.h, so as to reveal this
error.  Tell you what, I'll paste the first 25 lines of the error (there are
lots more):

TCSH-april:root:/home/chuckr/xorgsrc/driver/xf86-video-cyrix:#119-21:59>make
make  all-recursive
Making all in src
/bin/sh ../libtool --tag=CC    --mode=compile gcc -DHAVE_CONFIG_H -I. -I..
- -I/usr/X11R7.4/include/xorg -I/usr/X11R7.4/include/pixman-1
- -I/usr/X11R7.4/include -I/usr/X11R7.4/include -I/usr/local/include -MT
cyrix_accel.lo -MD -MP -MF .deps/cyrix_accel.Tpo -c -o cyrix_accel.lo cyrix_accel.c
 gcc -DHAVE_CONFIG_H -I. -I.. -I/usr/X11R7.4/include/xorg
- -I/usr/X11R7.4/include/pixman-1 -I/usr/X11R7.4/include -I/usr/X11R7.4/include
- -I/usr/local/include -MT cyrix_accel.lo -MD -MP -MF .deps/cyrix_accel.Tpo -c
cyrix_accel.c  -fPIC -DPIC -o .libs/cyrix_accel.o
In file included from cyrix_accel.c:39:
cyrix.h:113: error: expected specifier-qualifier-list before 'pciVideoPtr'
cyrix_accel.c: In function 'CYRIXAccelInit':
cyrix_accel.c:96: error: 'struct <anonymous>' has no member named 'AccelInfoRec'
cyrix_accel.c:114: error: 'struct <anonymous>' has no member named 'AccelInfoRec'
cyrix_accel.c:122: error: 'struct <anonymous>' has no member named 'AccelInfoRec'
cyrix_accel.c:157: error: 'struct <anonymous>' has no member named 'bltBufWidth'
cyrix_accel.c: In function 'CYRIXAccelSync':
cyrix_accel.c:183: error: 'struct <anonymous>' has no member named
'setBlitModeOnSync'
cyrix_accel.c:184: error: 'struct <anonymous>' has no member named
'setBlitModeOnSync'
cyrix_accel.c:186: error: 'struct <anonymous>' has no member named 'blitMode'
cyrix_accel.c: In function 'CYRIXSetupForSolidFill':
cyrix_accel.c:203: error: 'struct <anonymous>' has no member named 'AccelInfoRec'
cyrix_accel.c:205: error: 'struct <anonymous>' has no member named 'AccelInfoRec'
cyrix_accel.c:211: error: 'struct <anonymous>' has no member named 'blitMode'
cyrix_accel.c:213: error: 'struct <anonymous>' has no member named 'vectorMode'
cyrix_accel.c: In function 'CYRIXSubsequentSolidFillRect':
cyrix_accel.c:226: error: 'struct <anonymous>' has no member named 'bltBufWidth'
cyrix_accel.c:228: error: 'struct <anonymous>' has no member named 'bltBufWidth'
cyrix_accel.c:229: error: 'struct <anonymous>' has no member named 'bltBufWidth'
cyrix_accel.c:230: error: 'struct <anonymous>' has no member named 'bltBufWidth'
cyrix_accel.c:235: error: 'struct <anonymous>' has no member named 'blitMode'
cyrix_accel.c: In function 'CYRIXSetupForScreenToScreenCopy':
cyrix_accel.c:252: error: 'struct <anonymous>' has no member named 'AccelInfoRec'
cyrix_accel.c:254: error: 'struct <anonymous>' has no member named 'AccelInfoRec'
cyrix_accel.c:256: error: 'struct <anonymous>' has no member named 'AccelInfoRec'
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkh5Y5MACgkQz62J6PPcoOmYpwCgjlOpRQjAjSLlab+Rq9rhbgK8
4XkAnjBGbIK90g/AHpke0h7oyE/lE9G5
=sr8k
-----END PGP SIGNATURE-----