DRI fails to compile giving:

In file included from dri_util.c:41:
../../../../../../lib/GL/glx/xf86dri.h:98: warning: redundant redeclaration of
`XF86DRIDestroyContext' in same scope
/usr/src/dri-drm-cvs/Mesa/include/GL/internal/dri_interface.h:153: warning:
previous declaration of `XF86DRIDestroyContext'
../../../../../../lib/GL/glx/xf86dri.h:101: warning: redundant redeclaration of
`XF86DRICreateDrawable' in same scope
/usr/src/dri-drm-cvs/Mesa/include/GL/internal/dri_interface.h:156: warning:
previous declaration of `XF86DRICreateDrawable'
../../../../../../lib/GL/glx/xf86dri.h:104: warning: redundant redeclaration of
`XF86DRIDestroyDrawable' in same scope
/usr/src/dri-drm-cvs/Mesa/include/GL/internal/dri_interface.h:159: warning:
previous declaration of `XF86DRIDestroyDrawable'
In file included from dri_util.c:49:
dri_util.h:562: warning: redundant redeclaration of `glXGetProcAddress' in same
scope
/usr/src/dri-drm-cvs/Mesa/include/GL/glx.h:295: warning: previous declaration of
`glXGetProcAddress'
dri_util.c: In function `driCreateNewDrawable':
dri_util.c:851: warning: assignment from incompatible pointer type
dri_util.c: In function `driCreateNewContext':
dri_util.c:1036: warning: assignment from incompatible pointer type
dri_util.c:1037: warning: assignment from incompatible pointer type
dri_util.c:1039: warning: assignment from incompatible pointer type
dri_util.c:1040: warning: assignment from incompatible pointer type
dri_util.c: In function `driCalculateSwapUsage':
dri_util.c:1640: warning: ISO C forbids nested functions
dri_util.c:1640: error: syntax error before "get_msc_rate"
dri_util.c:1647: error: `get_msc_rate' undeclared (first use in this function)
dri_util.c:1647: error: (Each undeclared identifier is reported only once
dri_util.c:1647: error: for each function it appears in.)
dri_util.c:1648: error: `PFNGLXGETMSCRATEOMLPROC' undeclared (first use in this
function)
dri_util.c:1649: error: syntax error before "glXGetProcAddress"
dri_util.c:1653: error: `get_msc_rate' used prior to declaration
dri_util.c:1653: warning: implicit declaration of function `get_msc_rate'
make[6]: *** [dri_util.o] Error 1
make[6]: Leaving directory
`/usr/src/dri-drm-cvs/xc/xc/lib/GL/mesa/drivers/dri/common'
make[5]: *** [all] Error 2
make[5]: Leaving directory `/usr/src/dri-drm-cvs/xc/xc/lib/GL/mesa/drivers/dri'
make[4]: *** [all] Error 2
make[4]: Leaving directory `/usr/src/dri-drm-cvs/xc/xc/lib/GL'
make[3]: *** [all] Error 2
make[3]: Leaving directory `/usr/src/dri-drm-cvs/xc/xc/lib'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/usr/src/dri-drm-cvs/xc/xc'
make[1]: *** [World] Error 2
make[1]: Leaving directory `/usr/src/dri-drm-cvs/xc/xc'
make: *** [World] Error 2


The full output of world.log can be found at
http://scatcat.fhsu.edu/~jsrosenboom/world.log.

I am using Gentoo with their gentoo-dev-sources-2.6.7-r11 kernel, xorg-xll-6.7.0
server, on a Compaq Armada M700 laptop with an ATI Rage Mobility P/M 8MB AGP
card built in.  I have had problems previously with 2.6 kernels and resolved
them by doing this (I am the poster "adastra"):
http://forums.gentoo.org/viewtopic.php?t=98617&start=25 .  However now, step 5
of that post no longer works.  Looks like the problem has to do with Mesa.