From bbedb85898fb53bee613510e1fe8d890aab4cfda Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 26 Feb 2015 09:48:34 -0700 Subject: [PATCH] r200: replace INLINE with inline Reviewed-by: Alex Deucher --- src/mesa/drivers/dri/r200/r200_ioctl.h | 2 +- src/mesa/drivers/dri/r200/r200_swtcl.c | 2 +- src/mesa/drivers/dri/r200/r200_vertprog.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h index 1f8125a92c7..4c1f1ac698e 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.h +++ b/src/mesa/drivers/dri/r200/r200_ioctl.h @@ -102,7 +102,7 @@ do { \ memcpy( rmesa->hw.ATOM.lastcmd, rmesa->hw.ATOM.cmd, \ rmesa->hw.ATOM.cmd_size * 4) -static INLINE int R200_DB_STATECHANGE( +static inline int R200_DB_STATECHANGE( r200ContextPtr rmesa, struct radeon_state_atom *atom ) { diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c index cb07bcf1f8c..e8a06c89c2b 100644 --- a/src/mesa/drivers/dri/r200/r200_swtcl.c +++ b/src/mesa/drivers/dri/r200/r200_swtcl.c @@ -318,7 +318,7 @@ void r200_swtcl_flush(struct gl_context *ctx, uint32_t current_offset) /**************************************************************************/ -static INLINE GLuint reduced_hw_prim( struct gl_context *ctx, GLuint prim) +static inline GLuint reduced_hw_prim( struct gl_context *ctx, GLuint prim) { switch (prim) { case GL_POINTS: diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c index 23974738a83..fdfd27e2e47 100644 --- a/src/mesa/drivers/dri/r200/r200_vertprog.c +++ b/src/mesa/drivers/dri/r200/r200_vertprog.c @@ -152,7 +152,7 @@ static GLboolean r200VertexProgUpdateParams(struct gl_context *ctx, struct r200_ return GL_TRUE; } -static INLINE unsigned long t_dst_mask(GLuint mask) +static inline unsigned long t_dst_mask(GLuint mask) { /* WRITEMASK_* is equivalent to VSF_FLAG_* */ return mask & VSF_FLAG_ALL; @@ -223,7 +223,7 @@ static unsigned long t_src_class(gl_register_file file) } } -static INLINE unsigned long t_swizzle(GLubyte swizzle) +static inline unsigned long t_swizzle(GLubyte swizzle) { /* this is in fact a NOP as the Mesa SWIZZLE_* are all identical to VSF_IN_COMPONENT_* */ return swizzle; -- 2.30.2