[Guile-commits] GNU Guile branch, master, updated. v2.1.0-511-gd511a2e

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=d511a2e160ae808336d94683fe515a34247d3e4f

The branch, master has been updated
       via  d511a2e160ae808336d94683fe515a34247d3e4f (commit)
       via  8f0ecae98c7bef8b927287b38d12360296c236a4 (commit)
      from  fcd953f6990a813a204beea6992bc4287bb94513 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d511a2e160ae808336d94683fe515a34247d3e4f
Merge: fcd953f 8f0ecae
Author: Andy Wingo <address@hidden>
Date:   Thu Nov 28 16:24:38 2013 +0100

    Merge remote-tracking branch 'origin/stable-2.0'

-----------------------------------------------------------------------

Summary of changes:
 libguile/guardians.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libguile/guardians.c b/libguile/guardians.c
index f2651a8..86e39ee 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -50,7 +50,6 @@
 #endif
 
 #include "libguile/_scm.h"
-#include "libguile/async.h"
 #include "libguile/ports.h"
 #include "libguile/print.h"
 #include "libguile/smob.h"
@@ -147,7 +146,7 @@ finalize_guarded (void *ptr, void *finalizer_data)
 
       g = GUARDIAN_DATA (guardian);
 
-      scm_i_pthread_mutex_lock_block_asyncs (&g->mutex);
+      scm_i_pthread_mutex_lock (&g->mutex);
 
       if (g->live == 0)
        abort ();
@@ -163,7 +162,7 @@ finalize_guarded (void *ptr, void *finalizer_data)
 
       g->live--;
 
-      scm_i_pthread_mutex_unlock_unblock_asyncs (&g->mutex);
+      scm_i_pthread_mutex_unlock (&g->mutex);
     }
 
   if (scm_is_true (proxied_finalizer))
@@ -214,7 +213,7 @@ scm_i_guard (SCM guardian, SCM obj)
       void *prev_data;
       SCM guardians_for_obj, finalizer_data;
 
-      scm_i_pthread_mutex_lock_block_asyncs (&g->mutex);
+      scm_i_pthread_mutex_lock (&g->mutex);
 
       g->live++;
 
@@ -260,7 +259,7 @@ scm_i_guard (SCM guardian, SCM obj)
          SCM_SETCAR (finalizer_data, proxied_finalizer);
        }
 
-      scm_i_pthread_mutex_unlock_unblock_asyncs (&g->mutex);
+      scm_i_pthread_mutex_unlock (&g->mutex);
     }
 }
 
@@ -270,7 +269,7 @@ scm_i_get_one_zombie (SCM guardian)
   t_guardian *g = GUARDIAN_DATA (guardian);
   SCM res = SCM_BOOL_F;
 
-  scm_i_pthread_mutex_lock_block_asyncs (&g->mutex);
+  scm_i_pthread_mutex_lock (&g->mutex);
 
   if (!scm_is_null (g->zombies))
     {
@@ -279,7 +278,7 @@ scm_i_get_one_zombie (SCM guardian)
       g->zombies = SCM_CDR (g->zombies);
     }
 
-  scm_i_pthread_mutex_unlock_unblock_asyncs (&g->mutex);
+  scm_i_pthread_mutex_unlock (&g->mutex);
 
   return res;
 }


hooks/post-receive
-- 
GNU Guile