summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-21 10:55:24 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-21 10:55:24 -0600
commit71d2578ac5530c8641bcd5d9a9654373a6ce853e (patch)
tree15bfbb067bc3d2e4d5604b6ed343deefd57c8656 /src
parentba97ed2b743ba0b6631e0fbcf2ab12afe885f87c (diff)
replace __inline and __inline__ with INLINE macro
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/common/memops.h2
-rw-r--r--src/mesa/drivers/dri/common/mmio.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/common/memops.h b/src/mesa/drivers/dri/common/memops.h
index 4952d788e8..9cd1d8ec3f 100644
--- a/src/mesa/drivers/dri/common/memops.h
+++ b/src/mesa/drivers/dri/common/memops.h
@@ -4,7 +4,7 @@
* memset an area in I/O space
* We need to be careful about this on some archs
*/
-static __inline__ void drimemsetio(void* address, int c, int size)
+static INLINE void drimemsetio(void* address, int c, int size)
{
#if defined(__powerpc__) || defined(__ia64__)
int i;
diff --git a/src/mesa/drivers/dri/common/mmio.h b/src/mesa/drivers/dri/common/mmio.h
index 2b7b4123e5..89871aab59 100644
--- a/src/mesa/drivers/dri/common/mmio.h
+++ b/src/mesa/drivers/dri/common/mmio.h
@@ -37,7 +37,7 @@
#if defined( __powerpc__ )
-static __inline__ u_int32_t
+static INLINE u_int32_t
read_MMIO_LE32( volatile void * base, unsigned long offset )
{
u_int32_t val;
@@ -50,7 +50,7 @@ read_MMIO_LE32( volatile void * base, unsigned long offset )
#else
-static __inline__ u_int32_t
+static INLINE u_int32_t
read_MMIO_LE32( volatile void * base, unsigned long offset )
{
volatile u_int32_t * p = (volatile u_int32_t *) (((volatile char *) base) + offset);