diff options
| author | Yen-Chin Lee <coldnew.tw@gmail.com> | 2014-08-25 16:47:03 +0800 |
|---|---|---|
| committer | Yen-Chin Lee <coldnew.tw@gmail.com> | 2014-08-25 11:28:19 +0200 |
| commit | b98218587757699a2b17cee724b81ca8ea6b402d (patch) | |
| tree | 1e9e633c561f5fd7c3f7216a19870c445f0576b1 | |
| parent | 18ff0ff1ec5eb331fb25436386058b5d938a7ebb (diff) | |
Fix return type conflict with libhybris
The return type in 'PFNEGLHYBRISGETNATIVEBUFFERINFOPROC' and
'PFNEGLHYBRISSERIALIZENATIVEBUFFERPROC' conflict with hybris_native.h,
it is void while it should be EGLBoolean.
Change-Id: Ia23ab4da59b3a904eb5b2884398ab5dd207f415b
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Reviewed-by: Yen-Chin Lee <coldnew.tw@gmail.com>
| -rw-r--r-- | src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h index 35a3e8007..07d78017b 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -64,8 +64,8 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL #ifndef EGL_HYBRIS_native_buffer typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISCREATENATIVEBUFFERPROC)(EGLint width, EGLint height, EGLint usage, EGLint format, EGLint *stride, EGLClientBuffer *buffer); -typedef void (EGLAPIENTRYP PFNEGLHYBRISGETNATIVEBUFFERINFOPROC)(EGLClientBuffer buffer, int *num_ints, int *num_fds); -typedef void (EGLAPIENTRYP PFNEGLHYBRISSERIALIZENATIVEBUFFERPROC)(EGLClientBuffer buffer, int *ints, int *fds); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISGETNATIVEBUFFERINFOPROC)(EGLClientBuffer buffer, int *num_ints, int *num_fds); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISSERIALIZENATIVEBUFFERPROC)(EGLClientBuffer buffer, int *ints, int *fds); #endif #ifndef GL_OES_EGL_image |