From e02c1e215eabd14d0f58415e3a8179b995109696 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 16 Jul 2010 17:49:18 -0700 Subject: nouveau: s/inline/INLINE/ --- src/gallium/drivers/nouveau/nouveau_screen.h | 6 +++--- src/gallium/drivers/nouveau/nouveau_util.h | 2 +- src/gallium/drivers/nouveau/nouveau_winsys.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gallium/drivers/nouveau') diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h index 8eacdff035..8c290273fb 100644 --- a/src/gallium/drivers/nouveau/nouveau_screen.h +++ b/src/gallium/drivers/nouveau/nouveau_screen.h @@ -14,7 +14,7 @@ struct nouveau_screen { unsigned index_buffer_flags; }; -static inline struct nouveau_screen * +static INLINE struct nouveau_screen * nouveau_screen(struct pipe_screen *pscreen) { return (struct nouveau_screen *)pscreen; @@ -67,13 +67,13 @@ void nouveau_screen_fini(struct nouveau_screen *); -static __inline__ unsigned +static INLINE unsigned RING_3D(unsigned mthd, unsigned size) { return (7 << 13) | (size << 18) | mthd; } -static __inline__ unsigned +static INLINE unsigned RING_3D_NI(unsigned mthd, unsigned size) { return 0x40000000 | (7 << 13) | (size << 18) | mthd; diff --git a/src/gallium/drivers/nouveau/nouveau_util.h b/src/gallium/drivers/nouveau/nouveau_util.h index ed6e643785..a5e8537533 100644 --- a/src/gallium/drivers/nouveau/nouveau_util.h +++ b/src/gallium/drivers/nouveau/nouveau_util.h @@ -103,7 +103,7 @@ struct u_split_prim { uint edgeflag_off:1; }; -static inline void +static INLINE void u_split_prim_init(struct u_split_prim *s, unsigned mode, unsigned start, unsigned count) { diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index cd7da9977d..df79ca89ca 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -13,7 +13,7 @@ #include "nouveau/nouveau_resource.h" #include "nouveau/nouveau_pushbuf.h" -static inline uint32_t +static INLINE uint32_t nouveau_screen_transfer_flags(unsigned pipe) { uint32_t flags = 0; -- cgit v1.2.3