[Guile-commits] GNU Guile branch, master, updated. release_1-9-5-130-g393301c

[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=393301c5190d41f531c22b18f70e450207ea1418

The branch, master has been updated
       via  393301c5190d41f531c22b18f70e450207ea1418 (commit)
      from  7230aaf9610e8654c9395a3207c91663da78a873 (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 393301c5190d41f531c22b18f70e450207ea1418
Author: Andy Wingo <address@hidden>
Date:   Wed Dec 9 10:21:31 2009 +0100

    fix arbiter compilation with the generic codepath
    
    * libguile/arbiters.c (scm_try_arbiter, scm_release_arbiter): Fix for
      the generic case; not sure why it wasn't working.

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

Summary of changes:
 libguile/arbiters.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libguile/arbiters.c b/libguile/arbiters.c
index a53b702..5923c71 100644
--- a/libguile/arbiters.c
+++ b/libguile/arbiters.c
@@ -121,8 +121,10 @@ SCM_DEFINE (scm_try_arbiter, "try-arbiter", 1, 0, 0,
 #define FUNC_NAME s_scm_try_arbiter
 {
   scm_t_bits old;
+  scm_t_bits *loc;
   SCM_VALIDATE_SMOB (1, arb, arbiter);
-  FETCH_STORE (old, SCM_SMOB_DATA_0 (arb), SCM_LOCK_VAL);
+  loc = (scm_t_bits*)SCM_SMOB_OBJECT_N_LOC (arb, 0);
+  FETCH_STORE (old, *loc, SCM_LOCK_VAL);
   return scm_from_bool (old == SCM_UNLOCK_VAL);
 }
 #undef FUNC_NAME
@@ -147,8 +149,10 @@ SCM_DEFINE (scm_release_arbiter, "release-arbiter", 1, 0, 
0,
 #define FUNC_NAME s_scm_release_arbiter
 {
   scm_t_bits old;
+  scm_t_bits *loc;
   SCM_VALIDATE_SMOB (1, arb, arbiter);
-  FETCH_STORE (old, SCM_SMOB_DATA_0 (arb), SCM_UNLOCK_VAL);
+  loc = (scm_t_bits*)SCM_SMOB_OBJECT_N_LOC (arb, 0);
+  FETCH_STORE (old, *loc, SCM_UNLOCK_VAL);
   return scm_from_bool (old == SCM_LOCK_VAL);
 }
 #undef FUNC_NAME


hooks/post-receive
-- 
GNU Guile