Merge branch 'feat_misc' into beta2.2

Conflicts:
	acinclude.m4
	config-win32.h
	configure.ac
	misc.c
	thread.c
	thread.h
        - These conflicts was mainly due to feat_misc getting old
          and mostly caused by the pthread clean-up patches in
          feat_misc

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 0 insertions, 8 deletions

diff --git a/schedule.h b/schedule.h
index 1a6d219..71c6d8c 100644
--- a/schedule.h
+++ b/schedule.h
@@ -42,7 +42,6 @@
 /*#define SCHEDULE_TEST*/
 
 #include "otime.h"
-#include "thread.h"
 #include "error.h"
 
 struct schedule_entry
@@ -56,7 +55,6 @@ struct schedule_entry
 
 struct schedule
 {
-  MUTEX_DEFINE (mutex);
   struct schedule_entry *earliest_wakeup; /* cached earliest wakeup */
   struct schedule_entry *root;            /* the root of the treap (btree) */
 };
@@ -100,14 +98,12 @@ schedule_add_entry (struct schedule *s,
 		    const struct timeval *tv,
 		    unsigned int sigma)
 {
-  mutex_lock (&s->mutex);
   if (!IN_TREE (e) || !sigma || !tv_within_sigma (tv, &e->tv, sigma))
     {
       e->tv = *tv;
       schedule_add_modify (s, e);
       s->earliest_wakeup = NULL; /* invalidate cache */
     }
-  mutex_unlock (&s->mutex);
 }
 
 /*
@@ -122,8 +118,6 @@ schedule_get_earliest_wakeup (struct schedule *s,
 {
   struct schedule_entry *ret;
 
-  mutex_lock (&s->mutex);
-
   /* cache result */
   if (!s->earliest_wakeup)
     s->earliest_wakeup = schedule_find_least (s->root);
@@ -131,8 +125,6 @@ schedule_get_earliest_wakeup (struct schedule *s,
   if (ret)
     *wakeup = ret->tv;
 
-  mutex_unlock (&s->mutex);
-
   return ret;
 }