From 50fed7d1f91dbfacd73b0a6292990626a0d4f236 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 27 Feb 2010 06:17:14 +0000 Subject: [PATCH] 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 --- stream/cache2.c | 6 +++--- 1 file 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){