[MPlayer-cvslog] r28048 - in trunk: configure stream/cache2.c

reimar subversion at mplayerhq.hu
Fri Nov 28 18:04:36 CET 2008


Author: reimar
Date: Fri Nov 28 18:04:36 2008
New Revision: 28048

Log:
Move PTHREAD_CACHE define logic to configure.


Modified:
   trunk/configure
   trunk/stream/cache2.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Nov 28 18:04:36 2008
@@ -715,6 +715,7 @@ _rpath=no
 _asmalign_pot=auto
 _stream_cache=yes
 _def_stream_cache="#define CONFIG_STREAM_CACHE 1"
+_def_pthread_cache="#undef PTHREAD_CACHE"
 _need_shmem=yes
 for ac_option do
   case "$ac_option" in
@@ -3136,6 +3137,15 @@ else
 fi
 echores "$_pthreads"
 
+if cygwin ; then
+  if test "$_pthreads" = yes ; then
+    _def_pthread_cache="#define PTHREAD_CACHE 1"
+  else
+    _stream_cache=no
+    _def_stream_cache="#undef CONFIG_STREAM_CACHE"
+  fi
+fi
+
 echocheck "w32threads"
 if test "$_pthreads" = yes ; then
   _res_comment="using pthread instead"

Modified: trunk/stream/cache2.c
==============================================================================
--- trunk/stream/cache2.c	(original)
+++ trunk/stream/cache2.c	Fri Nov 28 18:04:36 2008
@@ -16,10 +16,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef __CYGWIN__
-#define PTHREAD_CACHE 1
-#endif
-
 #include "osdep/shmem.h"
 #include "osdep/timer.h"
 #if defined(__MINGW32__)



More information about the MPlayer-cvslog mailing list