summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-09-21 15:57:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 15:57:13 -0700
commitfdc85679cc300e9f7ee75040c25bef1826372ff0 (patch)
treed3e00874739e423061101bc7e630408104bf337f /include
parent862d6c2cc97acb86bb5fe577b8b923d4638dd944 (diff)
parent4ec134cdba52b663506562c6406b07915820b007 (diff)
downloadframeworks_base-fdc85679cc300e9f7ee75040c25bef1826372ff0.zip
frameworks_base-fdc85679cc300e9f7ee75040c25bef1826372ff0.tar.gz
frameworks_base-fdc85679cc300e9f7ee75040c25bef1826372ff0.tar.bz2
am 4ec134cd: am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread
Merge commit '4ec134cdba52b663506562c6406b07915820b007' * commit '4ec134cdba52b663506562c6406b07915820b007': Looper: use pthread_once for TLS key initialization.
Diffstat (limited to 'include')
-rw-r--r--include/utils/Looper.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/utils/Looper.h b/include/utils/Looper.h
index 7d90866..3f00b78 100644
--- a/include/utils/Looper.h
+++ b/include/utils/Looper.h
@@ -205,6 +205,7 @@ private:
int pollInner(int timeoutMillis);
+ static void initTLSKey();
static void threadDestructor(void *st);
};