[MPlayer-cvslog] r30754 - trunk/stream/cache2.c

[reimar]

Author: reimar
Date: Sat Feb 27 07:17:14 2010
New Revision: 30754

Log:
Restructure #ifs to be clearer, also ensures that we return from the thread
proc instead of calling exit() on __MINGW32__.

Modified:
   trunk/stream/cache2.c

Modified: trunk/stream/cache2.c
==============================================================================
--- trunk/stream/cache2.c	Fri Feb 26 22:41:42 2010	(r30753)
+++ trunk/stream/cache2.c	Sat Feb 27 07:17:14 2010	(r30754)
@@ -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){