Mercurial > mplayer.hg
changeset 30712:75903ab49159
Restructure #ifs to be clearer, also ensures that we return from the thread
proc instead of calling exit() on __MINGW32__.
| author | reimar |
|---|---|
| date | Sat, 27 Feb 2010 06:17:14 +0000 |
| parents | d68d26ab8e64 |
| children | 9dc765bfa063 |
| files | stream/cache2.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/cache2.c Fri Feb 26 21:41:42 2010 +0000 +++ b/stream/cache2.c Sat Feb 27 06:17:14 2010 +0000 @@ -430,12 +430,12 @@ } while (cache_execute_control(s)); #if defined(__MINGW32__) || defined(__OS2__) _endthread(); -#endif -#ifdef PTHREAD_CACHE +#elif defined(PTHREAD_CACHE) return NULL; -#endif +#else // make sure forked code never leaves this function exit(0); +#endif } int cache_stream_fill_buffer(stream_t *s){