Differences From Artifact [e79bb60b2e]:
- File src/threading.h — part of check-in [3e91cf6cef] at 2013-05-13 16:12:42 on branch trunk — Get rid of a type warning on win32. (user: js, size: 10560) [annotate] [blame] [check-ins using]
To Artifact [e8db192b1b]:
- File src/threading.h — part of check-in [2ac6cc1247] at 2013-09-17 14:14:10 on branch trunk — Only compare with PTHREAD_CANCELED if defined. (user: js, size: 10614) [annotate] [blame] [check-ins using]
︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | 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; |
︙ |