diff options
| author | 2016-12-14 23:58:54 +0000 | |
|---|---|---|
| committer | 2016-12-14 23:58:54 +0000 | |
| commit | e7142007849e51396947aba9c9050a6f641b903a (patch) | |
| tree | 0ef92839911d42f20cc7e21ff2f00e3d1c81b44d | |
| parent | d94925cf3c0a3e43677b6cf367f2c4250ce34675 (diff) | |
| parent | e1dd8131902ae8a2fa77efa1ee24a1bda4a0a7a5 (diff) | |
Merge "Fix more warnings in framworks/native/opengl/include"
| -rw-r--r-- | opengl/include/EGL/eglext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/include/EGL/eglext.h b/opengl/include/EGL/eglext.h index c7bdadb85a..8b48032af4 100644 --- a/opengl/include/EGL/eglext.h +++ b/opengl/include/EGL/eglext.h @@ -641,8 +641,8 @@ typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLCREATENATIVECLIENTBUFFERANDROID) (co EGLAPI EGLBoolean eglGetFrameTimestampsANDROID(EGLDisplay dpy, EGLSurface surface, EGLint framesAgo, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); EGLAPI EGLBoolean eglQueryTimestampSupportedANDROID(EGLDisplay dpy, EGLSurface surface, EGLint timestamp); #else -typedef EGLAPI EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSANDROID) (EGLDisplay dpy, EGLSurface surface, EGLint framesAgo, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); -typedef EGLAPI EGLBoolean (EGLAPIENTRYP PFNEGLQUERYTIMESTAMPSUPPORTEDANDROID) (EGLDisplay dpy, EGLSurface surface, EGLint timestamp); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSANDROID) (EGLDisplay dpy, EGLSurface surface, EGLint framesAgo, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYTIMESTAMPSUPPORTEDANDROID) (EGLDisplay dpy, EGLSurface surface, EGLint timestamp); #endif #endif |