diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-19 16:53:26 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-20 01:12:22 +0200 |
| commit | a6eb07b239339bae9969ce294d5b98407ced5273 (patch) | |
| tree | 3341e9cf7dc573cd561449094a9fd02dfb8a0d5a /sal/osl/unx/thread.c | |
| parent | 74b9ddd6aba2adfb43a0993306853e2fed821533 (diff) | |
Fix compiler warnings for Android
Diffstat (limited to 'sal/osl/unx/thread.c')
| -rw-r--r-- | sal/osl/unx/thread.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c index b5d80f135423..4128d08f0d63 100644 --- a/sal/osl/unx/thread.c +++ b/sal/osl/unx/thread.c @@ -268,10 +268,17 @@ static void* osl_thread_start_Impl (void* pData) /* Check if thread is started in SUSPENDED state */ while (pImpl->m_Flags & THREADIMPL_FLAGS_SUSPENDED) { +#ifdef ANDROID +/* Avoid compiler warning: declaration of '__cleanup' shadows a previous local */ +#define __cleanup __cleanup_2 +#endif /* wait until SUSPENDED flag is cleared */ pthread_cleanup_push (osl_thread_wait_cleanup_Impl, &(pImpl->m_Lock)); pthread_cond_wait (&(pImpl->m_Cond), &(pImpl->m_Lock)); pthread_cleanup_pop (0); +#ifdef ANDROID +#undef __cleanup +#endif } /* check for SUSPENDED to TERMINATE state change */ |