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/eglsurface.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/eglsurface.h')
| -rw-r--r-- | src/egl/main/eglsurface.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/egl/main/eglsurface.h b/src/egl/main/eglsurface.h index d13d301..898f3a4 100644 --- a/src/egl/main/eglsurface.h +++ b/src/egl/main/eglsurface.h @@ -31,6 +31,7 @@ #ifndef EGLSURFACE_INCLUDED #define EGLSURFACE_INCLUDED +#include "c99_compat.h" #include "egltypedefs.h" #include "egldisplay.h" @@ -105,7 +106,7 @@ _eglSwapInterval(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf, EGLint in /** * Increment reference count for the surface. */ -static INLINE _EGLSurface * +static inline _EGLSurface * _eglGetSurface(_EGLSurface *surf) { if (surf) @@ -117,7 +118,7 @@ _eglGetSurface(_EGLSurface *surf) /** * Decrement reference count for the surface. */ -static INLINE EGLBoolean +static inline EGLBoolean _eglPutSurface(_EGLSurface *surf) { return (surf) ? _eglPutResource(&surf->Resource) : EGL_FALSE; @@ -128,7 +129,7 @@ _eglPutSurface(_EGLSurface *surf) * Link a surface to its display and return the handle of the link. * The handle can be passed to client directly. */ -static INLINE EGLSurface +static inline EGLSurface _eglLinkSurface(_EGLSurface *surf) { _eglLinkResource(&surf->Resource, _EGL_RESOURCE_SURFACE); @@ -140,7 +141,7 @@ _eglLinkSurface(_EGLSurface *surf) * Unlink a linked surface from its display. * Accessing an unlinked surface should generate EGL_BAD_SURFACE error. */ -static INLINE void +static inline void _eglUnlinkSurface(_EGLSurface *surf) { _eglUnlinkResource(&surf->Resource, _EGL_RESOURCE_SURFACE); @@ -151,7 +152,7 @@ _eglUnlinkSurface(_EGLSurface *surf) * Lookup a handle to find the linked surface. * Return NULL if the handle has no corresponding linked surface. */ -static INLINE _EGLSurface * +static inline _EGLSurface * _eglLookupSurface(EGLSurface surface, _EGLDisplay *dpy) { _EGLSurface *surf = (_EGLSurface *) surface; @@ -164,7 +165,7 @@ _eglLookupSurface(EGLSurface surface, _EGLDisplay *dpy) /** * Return the handle of a linked surface, or EGL_NO_SURFACE. */ -static INLINE EGLSurface +static inline EGLSurface _eglGetSurfaceHandle(_EGLSurface *surf) { _EGLResource *res = (_EGLResource *) surf; |