diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
| commit | f6abe8f0f2fba3073b58b96ed38aae163c765b4a (patch) | |
| tree | 706ba29d021fb1e4c54500e8773e3dda5f9ff6e8 /src/mesa/drivers/dri/sis | |
| parent | a42dac187973cbc17be6c59db89264cbc935ab91 (diff) | |
| parent | 5174b85a0cb13b06779ea6fc0a8362c9fe57e2ea (diff) | |
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/drivers/dri/sis')
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_tris.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_tritmp.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_tris.h b/src/mesa/drivers/dri/sis/sis_tris.h index 5e07acc211..250949a83c 100644 --- a/src/mesa/drivers/dri/sis/sis_tris.h +++ b/src/mesa/drivers/dri/sis/sis_tris.h @@ -48,7 +48,7 @@ do { \ sisFlushPrims(smesa); \ } while (0) -static __inline GLuint *sisAllocDmaLow(sisContextPtr smesa, int bytes) +static INLINE GLuint *sisAllocDmaLow(sisContextPtr smesa, int bytes) { GLuint *start; diff --git a/src/mesa/drivers/dri/sis/sis_tritmp.h b/src/mesa/drivers/dri/sis/sis_tritmp.h index e670a5bf76..f75e17318f 100644 --- a/src/mesa/drivers/dri/sis/sis_tritmp.h +++ b/src/mesa/drivers/dri/sis/sis_tritmp.h @@ -234,7 +234,7 @@ static void TAG(sis6326_draw_point_mmio)(sisContextPtr smesa, char *verts) } #endif -static __inline void TAG(sis_vert_init)( void ) +static INLINE void TAG(sis_vert_init)( void ) { sis_tri_func_mmio[SIS_STATES] = TAG(sis_draw_tri_mmio); sis_line_func_mmio[SIS_STATES] = TAG(sis_draw_line_mmio); |