Overview
| Comment: | Only compare with PTHREAD_CANCELED if defined. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
2ac6cc12479ebbf7f68d5a9d5b664b59 |
| User & Date: | js on 2013-09-17 14:14:10 |
| Other Links: | manifest | tags |
Context
|
2013-09-17
| ||
| 16:12 | Work around Android bugs. check-in: c5e7dd679b user: js tags: trunk | |
| 14:14 | Only compare with PTHREAD_CANCELED if defined. check-in: 2ac6cc1247 user: js tags: trunk | |
| 13:57 | Update config.{guess,sub}. check-in: 7990726f2a user: js tags: trunk | |
Changes
Modified src/threading.h from [e79bb60b2e] to [e8db192b1b].
| ︙ | ︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 |
{
#if defined(OF_HAVE_PTHREADS)
void *ret;
if (pthread_join(thread, &ret))
return false;
return (ret != PTHREAD_CANCELED);
#elif defined(_WIN32)
if (WaitForSingleObject(thread, INFINITE))
return false;
CloseHandle(thread);
return true;
| > > > > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
{
#if defined(OF_HAVE_PTHREADS)
void *ret;
if (pthread_join(thread, &ret))
return false;
# ifdef PTHREAD_CANCELED
return (ret != PTHREAD_CANCELED);
# else
return true;
# endif
#elif defined(_WIN32)
if (WaitForSingleObject(thread, INFINITE))
return false;
CloseHandle(thread);
return true;
|
| ︙ | ︙ |