diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-22 01:52:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-22 01:52:06 +0000 |
| commit | d1668a71df761eb1644496f3e2c77c16fd54bb06 (patch) | |
| tree | 9acfbeb2c5fc1e858bed6db341004df078a2d4ab /libc/bionic/pthread_create.cpp | |
| parent | 4f11c59b3f3acffe6c8e359296a9e38c4b7edfb6 (diff) | |
| parent | 8b5df3920f2843c9cdf04160517c1e8b77c992f5 (diff) | |
| download | bionic-d1668a71df761eb1644496f3e2c77c16fd54bb06.zip bionic-d1668a71df761eb1644496f3e2c77c16fd54bb06.tar.gz bionic-d1668a71df761eb1644496f3e2c77c16fd54bb06.tar.bz2 | |
Merge "Turn on -Wold-style-cast and fix the errors."
Diffstat (limited to 'libc/bionic/pthread_create.cpp')
| -rw-r--r-- | libc/bionic/pthread_create.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp index e4abee9..7406b35 100644 --- a/libc/bionic/pthread_create.cpp +++ b/libc/bionic/pthread_create.cpp @@ -62,7 +62,7 @@ void __init_tls(pthread_internal_t* thread) { thread->tls[TLS_SLOT_SELF] = thread->tls; thread->tls[TLS_SLOT_THREAD_ID] = thread; // GCC looks in the TLS for the stack guard on x86, so copy it there from our global. - thread->tls[TLS_SLOT_STACK_GUARD] = (void*) __stack_chk_guard; + thread->tls[TLS_SLOT_STACK_GUARD] = reinterpret_cast<void*>(__stack_chk_guard); } void __init_alternate_signal_stack(pthread_internal_t* thread) { |