replace __inline and __inline__ with INLINE macro

This commit is contained in:
Brian Paul 2008-06-21 10:24:43 -06:00
parent 2c1bead069
commit 2e922b0e35
10 changed files with 14 additions and 18 deletions

View file

@ -79,7 +79,7 @@ struct ff_fixups {
/* Compute fixups of non-page aligned areas after a page fill.
* Return the number of fixups needed.
*/
static __inline__ int
static INLINE int
CreatorComputePageFillFixups(struct ff_fixups *fixups,
int x, int y, int w, int h,
int paligned_x, int paligned_y,

View file

@ -1,6 +1,6 @@
/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h,v 1.2 2002/02/22 21:32:58 dawes Exp $ */
static __inline void TAG(ffb_line)(GLcontext *ctx, ffb_vertex *v0,
static INLINE void TAG(ffb_line)(GLcontext *ctx, ffb_vertex *v0,
ffb_vertex *v1 )
{
ffbContextPtr fmesa = FFB_CONTEXT(ctx);

View file

@ -1,6 +1,6 @@
/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h,v 1.3 2002/02/22 21:32:59 dawes Exp $ */
static __inline void TAG(ffb_draw_point)(GLcontext *ctx, ffb_vertex *tmp )
static INLINE void TAG(ffb_draw_point)(GLcontext *ctx, ffb_vertex *tmp )
{
ffbContextPtr fmesa = FFB_CONTEXT(ctx);
ffb_fbcPtr ffb = fmesa->regs;

View file

@ -42,10 +42,6 @@
#include "ffb_vtxfmt.h"
#ifndef __GNUC__
#define __inline /**/
#endif
#define TNL_VERTEX ffbTnlVertex
#define INTERP_RGBA(t, out, a, b) \
@ -60,7 +56,7 @@ do { \
/* Color functions: */
static __inline void ffb_recalc_base_color(GLcontext *ctx)
static INLINE void ffb_recalc_base_color(GLcontext *ctx)
{
ffbContextPtr fmesa = FFB_CONTEXT(ctx);
struct gl_light *light;

View file

@ -384,7 +384,7 @@ struct gamma_context {
int TextureCount;
};
static __inline GLuint gammaPackColor( GLuint cpp,
static INLINE GLuint gammaPackColor( GLuint cpp,
GLubyte r, GLubyte g,
GLubyte b, GLubyte a )
{

View file

@ -129,13 +129,13 @@ static const GLuint hw_prim[GL_POLYGON+1] = {
B_PrimType_Polygon
};
static __inline void gammaStartPrimitive( gammaContextPtr gmesa, GLenum prim )
static INLINE void gammaStartPrimitive( gammaContextPtr gmesa, GLenum prim )
{
CHECK_DMA_BUFFER(gmesa, 1);
WRITE(gmesa->buf, Begin, gmesa->Begin | hw_prim[prim]);
}
static __inline void gammaEndPrimitive( gammaContextPtr gmesa )
static INLINE void gammaEndPrimitive( gammaContextPtr gmesa )
{
GLcontext *ctx = gmesa->glCtx;

View file

@ -34,7 +34,7 @@ do { \
} \
} while (0)
static __inline GLuint *i810AllocDmaLow( i810ContextPtr imesa, int bytes )
static INLINE GLuint *i810AllocDmaLow( i810ContextPtr imesa, int bytes )
{
if (imesa->vertex_low + bytes > imesa->vertex_high)
i810FlushPrimsGetBuffer( imesa );

View file

@ -27,7 +27,7 @@
#include "tnl/t_pipeline.h"
static __inline__ GLuint i810PackColor(GLuint format,
static INLINE GLuint i810PackColor(GLuint format,
GLubyte r, GLubyte g,
GLubyte b, GLubyte a)
{

View file

@ -64,7 +64,7 @@ void i810DestroyTexObj(i810ContextPtr imesa, i810TextureObjectPtr t)
/* From linux kernel i386 header files, copes with odd sizes better
* than COPY_DWORDS would:
*/
static __inline__ void * __memcpy(void * to, const void * from, size_t n)
static INLINE void * __memcpy(void * to, const void * from, size_t n)
{
int d0, d1, d2;
__asm__ __volatile__(

View file

@ -75,7 +75,7 @@ do { \
} while (0)
#endif
static __inline__ void i810_draw_triangle( i810ContextPtr imesa,
static INLINE void i810_draw_triangle( i810ContextPtr imesa,
i810VertexPtr v0,
i810VertexPtr v1,
i810VertexPtr v2 )
@ -90,7 +90,7 @@ static __inline__ void i810_draw_triangle( i810ContextPtr imesa,
}
static __inline__ void i810_draw_quad( i810ContextPtr imesa,
static INLINE void i810_draw_quad( i810ContextPtr imesa,
i810VertexPtr v0,
i810VertexPtr v1,
i810VertexPtr v2,
@ -109,7 +109,7 @@ static __inline__ void i810_draw_quad( i810ContextPtr imesa,
}
static __inline__ void i810_draw_point( i810ContextPtr imesa,
static INLINE void i810_draw_point( i810ContextPtr imesa,
i810VertexPtr tmp )
{
GLfloat sz = 0.5 * CLAMP(imesa->glCtx->Point.Size,
@ -133,7 +133,7 @@ static __inline__ void i810_draw_point( i810ContextPtr imesa,
}
static __inline__ void i810_draw_line( i810ContextPtr imesa,
static INLINE void i810_draw_line( i810ContextPtr imesa,
i810VertexPtr v0,
i810VertexPtr v1 )
{