[Guile-commits] GNU Guile branch, master, updated. v2.1.0-445-gfd57bbf

[Mark H Weaver]

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=fd57bbf5ac7c790f0731b1a44c7d20f469403009

The branch, master has been updated
       via  fd57bbf5ac7c790f0731b1a44c7d20f469403009 (commit)
       via  02a362a665ce462e4fe2409b2e2fc2c0007360f2 (commit)
       via  93825c9f0608ec85f17759b7d841927e6cf9f113 (commit)
       via  b29b2c87b4cd220868c787fd39a9b42fbf9602ef (commit)
       via  acc1d8e37a6e0e497dae88db276741928afbc901 (commit)
      from  d628c078cc8e2ccddbcab74346733486f7cf27e8 (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 fd57bbf5ac7c790f0731b1a44c7d20f469403009
Merge: d628c07 02a362a
Author: Mark H Weaver <address@hidden>
Date:   Mon Nov 5 15:57:03 2012 -0500

    Merge remote-tracking branch 'origin/stable-2.0'
    
    Conflicts:
        libguile/validate.h

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

Summary of changes:
 libguile/threads.c              |    9 +++++----
 libguile/validate.h             |    9 ++++-----
 module/ice-9/futures.scm        |    2 +-
 module/ice-9/r6rs-libraries.scm |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libguile/threads.c b/libguile/threads.c
index 8e72eaf..61fc43e 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -697,10 +697,11 @@ do_thread_exit (void *v)
 
          scm_i_pthread_mutex_lock (&m->lock);
 
-         /* Since MUTEX is in `t->mutexes', T must be its owner.  */
-         assert (scm_is_eq (m->owner, t->handle));
-
-         unblock_from_queue (m->waiting);
+         /* Check whether T owns MUTEX.  This is usually the case, unless
+            T abandoned MUTEX; in that case, T is no longer its owner (see
+            `fat_mutex_lock') but MUTEX is still in `t->mutexes'.  */
+         if (scm_is_eq (m->owner, t->handle))
+           unblock_from_queue (m->waiting);
 
          scm_i_pthread_mutex_unlock (&m->lock);
        }
diff --git a/libguile/validate.h b/libguile/validate.h
index 6dea795..b4d5441 100644
--- a/libguile/validate.h
+++ b/libguile/validate.h
@@ -3,7 +3,8 @@
 #ifndef SCM_VALIDATE_H
 #define SCM_VALIDATE_H
 
-/* Copyright (C) 1999,2000,2001, 2002, 2004, 2006, 2007, 2009, 2011 Free 
Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2009,
+ *   2011, 2012 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -91,11 +92,9 @@
 #define SCM_NUM2ULONG_LONG_DEF(pos, arg, def) \
   (SCM_UNBNDP (arg) ? def : scm_to_ulong_long (arg))
 
-#define SCM_NUM2FLOAT(pos, arg) \
-  (scm_num2float (arg, pos, FUNC_NAME))
+#define SCM_NUM2FLOAT(pos, arg) ((float) scm_to_double (arg))
 
-#define SCM_NUM2DOUBLE(pos, arg) \
-  (scm_num2double (arg, pos, FUNC_NAME))
+#define SCM_NUM2DOUBLE(pos, arg) (scm_to_double (arg))
 
 #define SCM_OUT_OF_RANGE(pos, arg) \
   do { scm_out_of_range_pos (FUNC_NAME, arg, scm_from_int (pos)); } while (0)
diff --git a/module/ice-9/futures.scm b/module/ice-9/futures.scm
index 2ab3edd..0f64b5c 100644
--- a/module/ice-9/futures.scm
+++ b/module/ice-9/futures.scm
@@ -1,6 +1,6 @@
 ;;; -*- mode: scheme; coding: utf-8; -*-
 ;;;
-;;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+;;; Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
 ;;;
 ;;; This library is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
diff --git a/module/ice-9/r6rs-libraries.scm b/module/ice-9/r6rs-libraries.scm
index f71b90b..019a6a7 100644
--- a/module/ice-9/r6rs-libraries.scm
+++ b/module/ice-9/r6rs-libraries.scm
@@ -29,7 +29,7 @@
   (define (sym? x) (symbol? (syntax->datum x)))
 
   (syntax-case import-spec (library only except prefix rename srfi)
-    ;; (srfi :n ...) -> (srfi srfi-n)
+    ;; (srfi :n ...) -> (srfi srfi-n ...)
     ((library (srfi colon-n rest ... (version ...)))
      (and (and-map sym? #'(srfi rest ...))
           (symbol? (syntax->datum #'colon-n))
@@ -40,7 +40,7 @@
                      (substring (symbol->string (syntax->datum #'colon-n))
                                 1)))))
        (resolve-r6rs-interface
-        #`(library (srfi #,srfi-n (version ...))))))
+        #`(library (srfi #,srfi-n rest ... (version ...))))))
     
     ((library (name name* ... (version ...)))
      (and-map sym? #'(name name* ...))


hooks/post-receive
-- 
GNU Guile