diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-27 06:17:14 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-27 06:17:14 +0000 |
commit | 50fed7d1f91dbfacd73b0a6292990626a0d4f236 (patch) | |
tree | a755cf7aa509e502aad1c299c09a6ec66a55562c /stream/cache2.c | |
parent | 09cf021307f6f8114af6dbaa81eb0a087275967c (diff) | |
download | mpv-50fed7d1f91dbfacd73b0a6292990626a0d4f236.tar.bz2 mpv-50fed7d1f91dbfacd73b0a6292990626a0d4f236.tar.xz |
Restructure #ifs to be clearer, also ensures that we return from the thread
proc instead of calling exit() on __MINGW32__.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30754 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/cache2.c')
-rw-r--r-- | stream/cache2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/cache2.c b/stream/cache2.c index 7e42c6b60e..1a7942d098 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -430,12 +430,12 @@ static void ThreadProc( void *s ){ } 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){ |