diff options
| author | Emil Velikov <[email protected]> | 2015-02-28 16:35:22 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-03-05 14:45:53 +0000 |
| commit | 7bd1693877e4de9aaf8f6776649fc48db54ec82b (patch) | |
| tree | b4752b18050a4287888e66c3f63e2d5fe7cd0b56 /src/egl/main/eglcurrent.c | |
| parent | 9385c592c68e7304cd9084fe17f27ec17319cdcf (diff) | |
egl/main: replace INLINE with inline
Drop the custom keyword in favour of the C99 one. All the places using
it now directly include c99_compat.h which should handle things on
platforms which lack it.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/egl/main/eglcurrent.c')
| -rw-r--r-- | src/egl/main/eglcurrent.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/egl/main/eglcurrent.c b/src/egl/main/eglcurrent.c index fcb732d4984..d358feaad5e 100644 --- a/src/egl/main/eglcurrent.c +++ b/src/egl/main/eglcurrent.c @@ -28,6 +28,8 @@ #include <stdlib.h> #include <string.h> +#include "c99_compat.h" + #include "egllog.h" #include "eglmutex.h" #include "eglcurrent.h" @@ -55,7 +57,7 @@ static __thread const _EGLThreadInfo *_egl_TLS __attribute__ ((tls_model("initial-exec"))); #endif -static INLINE void _eglSetTSD(const _EGLThreadInfo *t) +static inline void _eglSetTSD(const _EGLThreadInfo *t) { pthread_setspecific(_egl_TSD, (const void *) t); #ifdef GLX_USE_TLS @@ -63,7 +65,7 @@ static INLINE void _eglSetTSD(const _EGLThreadInfo *t) #endif } -static INLINE _EGLThreadInfo *_eglGetTSD(void) +static inline _EGLThreadInfo *_eglGetTSD(void) { #ifdef GLX_USE_TLS return (_EGLThreadInfo *) _egl_TLS; @@ -72,7 +74,7 @@ static INLINE _EGLThreadInfo *_eglGetTSD(void) #endif } -static INLINE void _eglFiniTSD(void) +static inline void _eglFiniTSD(void) { _eglLockMutex(&_egl_TSDMutex); if (_egl_TSDInitialized) { @@ -86,7 +88,7 @@ static INLINE void _eglFiniTSD(void) _eglUnlockMutex(&_egl_TSDMutex); } -static INLINE EGLBoolean _eglInitTSD(void (*dtor)(_EGLThreadInfo *)) +static inline EGLBoolean _eglInitTSD(void (*dtor)(_EGLThreadInfo *)) { if (!_egl_TSDInitialized) { _eglLockMutex(&_egl_TSDMutex); @@ -112,23 +114,23 @@ static INLINE EGLBoolean _eglInitTSD(void (*dtor)(_EGLThreadInfo *)) static const _EGLThreadInfo *_egl_TSD; static void (*_egl_FreeTSD)(_EGLThreadInfo *); -static INLINE void _eglSetTSD(const _EGLThreadInfo *t) +static inline void _eglSetTSD(const _EGLThreadInfo *t) { _egl_TSD = t; } -static INLINE _EGLThreadInfo *_eglGetTSD(void) +static inline _EGLThreadInfo *_eglGetTSD(void) { return (_EGLThreadInfo *) _egl_TSD; } -static INLINE void _eglFiniTSD(void) +static inline void _eglFiniTSD(void) { if (_egl_FreeTSD && _egl_TSD) _egl_FreeTSD((_EGLThreadInfo *) _egl_TSD); } -static INLINE EGLBoolean _eglInitTSD(void (*dtor)(_EGLThreadInfo *)) +static inline EGLBoolean _eglInitTSD(void (*dtor)(_EGLThreadInfo *)) { if (!_egl_FreeTSD && dtor) { _egl_FreeTSD = dtor; @@ -179,7 +181,7 @@ _eglDestroyThreadInfo(_EGLThreadInfo *t) /** * Make sure TSD is initialized and return current value. */ -static INLINE _EGLThreadInfo * +static inline _EGLThreadInfo * _eglCheckedGetTSD(void) { if (_eglInitTSD(&_eglDestroyThreadInfo) != EGL_TRUE) { |