Problem building xf86-video-intel (i830_cursror.c)

[Ken Mandelberg]

I'm having trouble building the current git version of xf86-video-intel 
against the latest git xserver src. The problem is i830_cursor.c in the 
intel src, which isn't in sync with the latest 
xserver//hw/xfree86/modes/xf86Crtc.h via git.

  gcc -DHAVE_CONFIG_H -I. -I. -I.. -Wall -Wpointer-arith 
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations 
-Wnested-externs -fno-strict-aliasing -I/usr/include/xorg 
-I/usr/include/drm -I/usr/include/X11/dri -DXF86_MODES_RENAME 
-I../src/modes -I../src/parser -DI830_XV -DI830_USE_XAA -DI830_USE_EXA 
-g -O2 -MT i830_cursor.lo -MD -MP -MF .deps/i830_cursor.Tpo -c 
i830_cursor.c  -fPIC -DPIC -o .libs/i830_cursor.o
i830_cursor.c: In function 'I830SetPipeCursor':
i830_cursor.c:121: error: 'struct _xf86Crtc' has no member named 
'cursorInRange'i830_cursor.c:122: error: 'struct _xf86Crtc' has no 
member named 'cursorShown'
....