diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-02-28 16:35:22 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-05 14:45:53 +0000 |
| commit | 7bd1693877e4de9aaf8f6776649fc48db54ec82b (patch) | |
| tree | b4752b18050a4287888e66c3f63e2d5fe7cd0b56 /src/egl/main/eglcontext.h | |
| parent | 9385c592c68e7304cd9084fe17f27ec17319cdcf (diff) | |
| download | external_mesa3d-7bd1693877e4de9aaf8f6776649fc48db54ec82b.zip external_mesa3d-7bd1693877e4de9aaf8f6776649fc48db54ec82b.tar.gz external_mesa3d-7bd1693877e4de9aaf8f6776649fc48db54ec82b.tar.bz2 | |
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 <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/egl/main/eglcontext.h')
| -rw-r--r-- | src/egl/main/eglcontext.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/egl/main/eglcontext.h b/src/egl/main/eglcontext.h index 73badc5..5b574b5 100644 --- a/src/egl/main/eglcontext.h +++ b/src/egl/main/eglcontext.h @@ -31,6 +31,7 @@ #ifndef EGLCONTEXT_INCLUDED #define EGLCONTEXT_INCLUDED +#include "c99_compat.h" #include "egltypedefs.h" #include "egldisplay.h" @@ -81,7 +82,7 @@ _eglBindContext(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read, /** * Increment reference count for the context. */ -static INLINE _EGLContext * +static inline _EGLContext * _eglGetContext(_EGLContext *ctx) { if (ctx) @@ -93,7 +94,7 @@ _eglGetContext(_EGLContext *ctx) /** * Decrement reference count for the context. */ -static INLINE EGLBoolean +static inline EGLBoolean _eglPutContext(_EGLContext *ctx) { return (ctx) ? _eglPutResource(&ctx->Resource) : EGL_FALSE; @@ -104,7 +105,7 @@ _eglPutContext(_EGLContext *ctx) * Link a context to its display and return the handle of the link. * The handle can be passed to client directly. */ -static INLINE EGLContext +static inline EGLContext _eglLinkContext(_EGLContext *ctx) { _eglLinkResource(&ctx->Resource, _EGL_RESOURCE_CONTEXT); @@ -116,7 +117,7 @@ _eglLinkContext(_EGLContext *ctx) * Unlink a linked context from its display. * Accessing an unlinked context should generate EGL_BAD_CONTEXT error. */ -static INLINE void +static inline void _eglUnlinkContext(_EGLContext *ctx) { _eglUnlinkResource(&ctx->Resource, _EGL_RESOURCE_CONTEXT); @@ -127,7 +128,7 @@ _eglUnlinkContext(_EGLContext *ctx) * Lookup a handle to find the linked context. * Return NULL if the handle has no corresponding linked context. */ -static INLINE _EGLContext * +static inline _EGLContext * _eglLookupContext(EGLContext context, _EGLDisplay *dpy) { _EGLContext *ctx = (_EGLContext *) context; @@ -140,7 +141,7 @@ _eglLookupContext(EGLContext context, _EGLDisplay *dpy) /** * Return the handle of a linked context, or EGL_NO_CONTEXT. */ -static INLINE EGLContext +static inline EGLContext _eglGetContextHandle(_EGLContext *ctx) { _EGLResource *res = (_EGLResource *) ctx; |