diff options
Diffstat (limited to 'src/gallium/include')
-rw-r--r-- | src/gallium/include/pipe/p_compiler.h | 7 | ||||
-rw-r--r-- | src/gallium/include/state_tracker/st_api.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 0e953695b52..7eed57018b7 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -94,11 +94,6 @@ typedef unsigned char boolean; #endif #endif -/* XXX: Use standard `inline` keyword instead */ -#ifndef INLINE -# define INLINE inline -#endif - /* Forced function inlining */ #ifndef ALWAYS_INLINE # ifdef __GNUC__ @@ -106,7 +101,7 @@ typedef unsigned char boolean; # elif defined(_MSC_VER) # define ALWAYS_INLINE __forceinline # else -# define ALWAYS_INLINE INLINE +# define ALWAYS_INLINE inline # endif #endif diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h index ecf1c07fb98..356863d8531 100644 --- a/src/gallium/include/state_tracker/st_api.h +++ b/src/gallium/include/state_tracker/st_api.h @@ -533,7 +533,7 @@ struct st_api /** * Return true if the visual has the specified buffers. */ -static INLINE boolean +static inline boolean st_visual_have_buffers(const struct st_visual *visual, unsigned mask) { return ((visual->buffer_mask & mask) == mask); |