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/eglimage.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/eglimage.h')
| -rw-r--r-- | src/egl/main/eglimage.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/egl/main/eglimage.h b/src/egl/main/eglimage.h index 1b4d6cd..71c52ca 100644 --- a/src/egl/main/eglimage.h +++ b/src/egl/main/eglimage.h @@ -30,6 +30,7 @@ #ifndef EGLIMAGE_INCLUDED #define EGLIMAGE_INCLUDED +#include "c99_compat.h" #include "egltypedefs.h" #include "egldisplay.h" @@ -92,7 +93,7 @@ _eglInitImage(_EGLImage *img, _EGLDisplay *dpy); /** * Increment reference count for the image. */ -static INLINE _EGLImage * +static inline _EGLImage * _eglGetImage(_EGLImage *img) { if (img) @@ -104,7 +105,7 @@ _eglGetImage(_EGLImage *img) /** * Decrement reference count for the image. */ -static INLINE EGLBoolean +static inline EGLBoolean _eglPutImage(_EGLImage *img) { return (img) ? _eglPutResource(&img->Resource) : EGL_FALSE; @@ -115,7 +116,7 @@ _eglPutImage(_EGLImage *img) * Link an image to its display and return the handle of the link. * The handle can be passed to client directly. */ -static INLINE EGLImageKHR +static inline EGLImageKHR _eglLinkImage(_EGLImage *img) { _eglLinkResource(&img->Resource, _EGL_RESOURCE_IMAGE); @@ -127,7 +128,7 @@ _eglLinkImage(_EGLImage *img) * Unlink a linked image from its display. * Accessing an unlinked image should generate EGL_BAD_PARAMETER error. */ -static INLINE void +static inline void _eglUnlinkImage(_EGLImage *img) { _eglUnlinkResource(&img->Resource, _EGL_RESOURCE_IMAGE); @@ -138,7 +139,7 @@ _eglUnlinkImage(_EGLImage *img) * Lookup a handle to find the linked image. * Return NULL if the handle has no corresponding linked image. */ -static INLINE _EGLImage * +static inline _EGLImage * _eglLookupImage(EGLImageKHR image, _EGLDisplay *dpy) { _EGLImage *img = (_EGLImage *) image; @@ -151,7 +152,7 @@ _eglLookupImage(EGLImageKHR image, _EGLDisplay *dpy) /** * Return the handle of a linked image, or EGL_NO_IMAGE_KHR. */ -static INLINE EGLImageKHR +static inline EGLImageKHR _eglGetImageHandle(_EGLImage *img) { _EGLResource *res = (_EGLResource *) img; |