Mesa compilation problem

I've been updating our version of X, in the past was able to 
successfully compile libdrm + Mesa, but this time ran into the following 
compilation problem that I've been unable to solve.  Does anyone have 
any suggestions about what would cause this?

make[6]: Entering directory 
`/usr/local/src/xc/Mesa-7.10/src/mesa/drivers/dri/i810'
gcc -c -I. -I../../../../../src/mesa/drivers/dri/common -Iserver 
-I../../../../../include -I../../../../../src/mapi 
-I../../../../../src/mesa -I../../../../../src/egl/main 
-I../../../../../src/egl/drivers/dri -I/usr/local/X11/include 
-I/usr/local/X11/include/libdrm    -g -O2 -Wall -Wmissing-prototypes 
-std=c99 -ffast-math -fvisibility=hidden -fno-strict-aliasing  -fPIC 
-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE 
-DPTHREADS -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 
-DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING 
-DHAVE_ALIAS -DHAVE_XCB_DRI2 -DHAVE_XEXTPROTO_71 -DFEATURE_GL=1 
../common/utils.c -o ../common/utils.o
In file included from ../../../../../include/GL/internal/dri_interface.h:51,
                  from ../common/utils.h:32,
                  from ../common/utils.c:37:
/usr/local/X11/include/libdrm/drm.h:612: error: expected 
specifier-qualifier-list before '__u64'