diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-21 10:30:01 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-21 10:30:01 -0600 |
| commit | 24197b4901c72b3a2c6afcb3f6936e0876853e1d (patch) | |
| tree | 6f86c816c5224054962646f2a59c59f16d2153b1 /src/mesa/drivers/dri/mach64 | |
| parent | 7899270b9f10b5671e7ea644a66832fe86b5a1a1 (diff) | |
replace __inline and __inline__ with INLINE macro
Diffstat (limited to 'src/mesa/drivers/dri/mach64')
| -rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_ioctl.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_tex.h | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_tris.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/mach64/mach64_ioctl.h b/src/mesa/drivers/dri/mach64/mach64_ioctl.h index c28bf31c49..3e5faff4e6 100644 --- a/src/mesa/drivers/dri/mach64/mach64_ioctl.h +++ b/src/mesa/drivers/dri/mach64/mach64_ioctl.h @@ -44,7 +44,7 @@ extern void mach64FlushVerticesLocked( mach64ContextPtr mmesa ); extern void mach64FlushDMALocked( mach64ContextPtr mmesa ); extern void mach64UploadHwStateLocked( mach64ContextPtr mmesa ); -static __inline void *mach64AllocDmaLow( mach64ContextPtr mmesa, int bytes ) +static INLINE void *mach64AllocDmaLow( mach64ContextPtr mmesa, int bytes ) { CARD32 *head; @@ -60,7 +60,7 @@ static __inline void *mach64AllocDmaLow( mach64ContextPtr mmesa, int bytes ) return head; } -static __inline void *mach64AllocDmaLocked( mach64ContextPtr mmesa, int bytes ) +static INLINE void *mach64AllocDmaLocked( mach64ContextPtr mmesa, int bytes ) { CARD32 *head; diff --git a/src/mesa/drivers/dri/mach64/mach64_tex.h b/src/mesa/drivers/dri/mach64/mach64_tex.h index f6cf1cf802..933cfbbab4 100644 --- a/src/mesa/drivers/dri/mach64/mach64_tex.h +++ b/src/mesa/drivers/dri/mach64/mach64_tex.h @@ -72,9 +72,9 @@ extern void mach64InitTextureFuncs( struct dd_function_table *functions ); #define MACH64PACKCOLOR4444(r, g, b, a) \ ((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4)) -static __inline__ GLuint mach64PackColor( GLuint cpp, - GLubyte r, GLubyte g, - GLubyte b, GLubyte a ) +static INLINE GLuint mach64PackColor( GLuint cpp, + GLubyte r, GLubyte g, + GLubyte b, GLubyte a ) { switch ( cpp ) { case 2: diff --git a/src/mesa/drivers/dri/mach64/mach64_tris.c b/src/mesa/drivers/dri/mach64/mach64_tris.c index 369f610442..5ce348f34d 100644 --- a/src/mesa/drivers/dri/mach64/mach64_tris.c +++ b/src/mesa/drivers/dri/mach64/mach64_tris.c @@ -113,7 +113,7 @@ do { \ #define COPY_VERTEX_OOA( vb, vertsize, v, n ) DO_COPY_VERTEX( vb, vertsize, v, n, 1 ) -static __inline void mach64_draw_quad( mach64ContextPtr mmesa, +static INLINE void mach64_draw_quad( mach64ContextPtr mmesa, mach64VertexPtr v0, mach64VertexPtr v1, mach64VertexPtr v2, @@ -419,7 +419,7 @@ static __inline void mach64_draw_quad( mach64ContextPtr mmesa, #endif } -static __inline void mach64_draw_triangle( mach64ContextPtr mmesa, +static INLINE void mach64_draw_triangle( mach64ContextPtr mmesa, mach64VertexPtr v0, mach64VertexPtr v1, mach64VertexPtr v2 ) @@ -666,7 +666,7 @@ static __inline void mach64_draw_triangle( mach64ContextPtr mmesa, #endif } -static __inline void mach64_draw_line( mach64ContextPtr mmesa, +static INLINE void mach64_draw_line( mach64ContextPtr mmesa, mach64VertexPtr v0, mach64VertexPtr v1 ) { @@ -955,7 +955,7 @@ static __inline void mach64_draw_line( mach64ContextPtr mmesa, #endif } -static __inline void mach64_draw_point( mach64ContextPtr mmesa, +static INLINE void mach64_draw_point( mach64ContextPtr mmesa, mach64VertexPtr v0 ) { #if MACH64_NATIVE_VTXFMT |