commit 4ada6dc8f2fd3483a5d83de72c077bd5b86c0abe
author Colin Cross <ccross@android.com> Thu Dec 15 00:40:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 15 00:40:23 2016 +0000
tree 60ade9b8085e1af9b5aa97abfb2420078bdd997b
parent 9698c2f193666ab506a6edf113c5a77d0d0acb3b
parent 3424c8d1ee58f960788af697fb0872709678def4

Merge "Fix more warnings in framworks/native/opengl/include" am: e714200784 am: caf04ed42f am: 7e7f3d4672
am: 3424c8d1ee

Change-Id: I650265920a5459fd63b124b60957c3a6e89cdd6e

opengl/include/EGL/eglext.h

diff --git a/opengl/include/EGL/eglext.h b/opengl/include/EGL/eglext.h
index 73e5e07..874e712 100644
--- a/opengl/include/EGL/eglext.h
+++ b/opengl/include/EGL/eglext.h
@@ -643,8 +643,8 @@
 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