Merge branch 'gallium-0.1' into gallium-0.2

[mesa.git] / src / mesa / drivers / dri / sis / sis_tris.h

diff --git a/src/mesa/drivers/dri/sis/sis_tris.h b/src/mesa/drivers/dri/sis/sis_tris.h
index 499eb4d24d4e86b3b0e296e17c8973fc02cf2398..7ee276c66ea009c41ca0c1228d795e3443b32f22 100644 (file)
--- a/src/mesa/drivers/dri/sis/sis_tris.h
+++ b/src/mesa/drivers/dri/sis/sis_tris.h
@@ -47,7 +47,7 @@ do {                                                  \
       sisFlushPrims(smesa);                            \
 } while (0)
 
-static __inline GLuint *sisAllocDmaLow(sisContextPtr smesa, int bytes)
+static INLINE GLuint *sisAllocDmaLow(sisContextPtr smesa, int bytes)
 {
    GLuint *start;