diff options
| author | Mathias Agopian <mathias@google.com> | 2010-04-10 11:43:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:43:17 -0700 |
| commit | 3dce8949db05607c555636900860de2690fa25e5 (patch) | |
| tree | 2f9da14a283acc2b6eb75adaf4469410ad9254f2 /opengl | |
| parent | 55f9c17777a25792fd8b453799aa31daf122c279 (diff) | |
| parent | c0fa6589522baa45a7230e347046901f3b4a8e07 (diff) | |
| download | frameworks_base-3dce8949db05607c555636900860de2690fa25e5.zip frameworks_base-3dce8949db05607c555636900860de2690fa25e5.tar.gz frameworks_base-3dce8949db05607c555636900860de2690fa25e5.tar.bz2 | |
am c0fa6589: am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 2 | ||||
| -rw-r--r-- | opengl/libs/egl_impl.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 89b3e1f..e6cf792 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -239,7 +239,7 @@ struct tls_t // ---------------------------------------------------------------------------- -egl_connection_t gEGLImpl[IMPL_NUM_IMPLEMENTATIONS]; +static egl_connection_t gEGLImpl[IMPL_NUM_IMPLEMENTATIONS]; static egl_display_t gDisplay[NUM_DISPLAYS]; static pthread_mutex_t gThreadLocalStorageKeyMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_key_t gEGLThreadLocalStorageKey = -1; diff --git a/opengl/libs/egl_impl.h b/opengl/libs/egl_impl.h index 1fba209f7..c8f529a 100644 --- a/opengl/libs/egl_impl.h +++ b/opengl/libs/egl_impl.h @@ -31,6 +31,7 @@ namespace android { struct egl_connection_t { + inline egl_connection_t() : dso(0) { } void * dso; gl_hooks_t * hooks[2]; EGLint major; |