diff options
| author | Ilia Mirkin <[email protected]> | 2015-07-20 19:58:43 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2015-07-21 17:52:16 -0400 |
| commit | a2a1a5805fd617e7f3cc8be44dd79b50da07ebb9 (patch) | |
| tree | 7e6a9899840ea5e7fef875185f05eafc1b04d293 /src/gallium/include | |
| parent | 958b5c31116f46a81249d11033164354ec158556 (diff) | |
gallium: replace INLINE with inline
Generated by running:
git grep -l INLINE src/gallium/ | xargs sed -i 's/\bINLINE\b/inline/g'
git grep -l INLINE src/mesa/state_tracker/ | xargs sed -i 's/\bINLINE\b/inline/g'
git checkout src/gallium/state_trackers/clover/Doxyfile
and manual edits to
src/gallium/include/pipe/p_compiler.h
src/gallium/README.portability
to remove mentions of the inline define.
Signed-off-by: Ilia Mirkin <[email protected]>
Acked-by: Marek Olšák <[email protected]>
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); |