diff options
| author | Chih-hung Hsieh | 2014-11-17 16:58:50 -0600 |
|---|---|---|
| committer | Android Git Automerger | 2014-11-17 16:58:50 -0600 |
| commit | 22536916a5abd294ed4ccfa5bde9066305c81b48 (patch) | |
| tree | 0db33a0fbf7b3e85527d050f3b41dd241a500961 /opengl | |
| parent | 519cc65dd84f04c9078d70fb06c01fb63357ae93 (diff) | |
| parent | 1bb53054f2d77ce570a22629006c849fc54707dc (diff) | |
| download | frameworks-native-22536916a5abd294ed4ccfa5bde9066305c81b48.tar.gz frameworks-native-22536916a5abd294ed4ccfa5bde9066305c81b48.tar.xz frameworks-native-22536916a5abd294ed4ccfa5bde9066305c81b48.zip | |
am 1bb53054: Merge "Fix class vs. struct mismatch"
* commit '1bb53054f2d77ce570a22629006c849fc54707dc':
Fix class vs. struct mismatch
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl_display.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/EGL/egl_display.h b/opengl/libs/EGL/egl_display.h index 87f27f800..0a6e4253c 100644 --- a/opengl/libs/EGL/egl_display.h +++ b/opengl/libs/EGL/egl_display.h | |||
| @@ -39,7 +39,7 @@ namespace android { | |||
| 39 | 39 | ||
| 40 | class egl_object_t; | 40 | class egl_object_t; |
| 41 | class egl_context_t; | 41 | class egl_context_t; |
| 42 | class egl_connection_t; | 42 | struct egl_connection_t; |
| 43 | 43 | ||
| 44 | // ---------------------------------------------------------------------------- | 44 | // ---------------------------------------------------------------------------- |
| 45 | 45 | ||