mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-13 15:10:34 +02:00
Code Activity

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

Browse source 
Conflicts:
	libguile/validate.h
This commit is contained in:
Mark H Weaver 2012-11-05 15:57:03 -05:00
commit fd57bbf5ac
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libguile/threads.c
View file

@ -697,9 +697,10 @@ do_thread_exit (void *v)
scm_i_pthread_mutex_lock (&m->lock); scm_i_pthread_mutex_lock (&m->lock);
/* Since MUTEX is in `t->mutexes', T must be its owner. */ /* Check whether T owns MUTEX. This is usually the case, unless
assert (scm_is_eq (m->owner, t->handle)); 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); unblock_from_queue (m->waiting);
scm_i_pthread_mutex_unlock (&m->lock); scm_i_pthread_mutex_unlock (&m->lock);

9
libguile/validate.h
View file

@ -3,7 +3,8 @@
#ifndef SCM_VALIDATE_H #ifndef SCM_VALIDATE_H
#define 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -91,11 +92,9 @@
#define SCM_NUM2ULONG_LONG_DEF(pos, arg, def) \ #define SCM_NUM2ULONG_LONG_DEF(pos, arg, def) \
(SCM_UNBNDP (arg) ? def : scm_to_ulong_long (arg)) (SCM_UNBNDP (arg) ? def : scm_to_ulong_long (arg))
#define SCM_NUM2FLOAT(pos, arg) \ #define SCM_NUM2FLOAT(pos, arg) ((float) scm_to_double (arg))
(scm_num2float (arg, pos, FUNC_NAME))
#define SCM_NUM2DOUBLE(pos, arg) \ #define SCM_NUM2DOUBLE(pos, arg) (scm_to_double (arg))
(scm_num2double (arg, pos, FUNC_NAME))
#define SCM_OUT_OF_RANGE(pos, arg) \ #define SCM_OUT_OF_RANGE(pos, arg) \
do { scm_out_of_range_pos (FUNC_NAME, arg, scm_from_int (pos)); } while (0) do { scm_out_of_range_pos (FUNC_NAME, arg, scm_from_int (pos)); } while (0)

2
module/ice-9/futures.scm
View file

@ -1,6 +1,6 @@
;;; -*- mode: scheme; coding: utf-8; -*- ;;; -*- 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 ;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Lesser General Public ;;; modify it under the terms of the GNU Lesser General Public

4
module/ice-9/r6rs-libraries.scm
View file

@ -29,7 +29,7 @@
(define (sym? x) (symbol? (syntax->datum x))) (define (sym? x) (symbol? (syntax->datum x)))
(syntax-case import-spec (library only except prefix rename srfi) (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 ...))) ((library (srfi colon-n rest ... (version ...)))
(and (and-map sym? #'(srfi rest ...)) (and (and-map sym? #'(srfi rest ...))
(symbol? (syntax->datum #'colon-n)) (symbol? (syntax->datum #'colon-n))
@ -40,7 +40,7 @@
(substring (symbol->string (syntax->datum #'colon-n)) (substring (symbol->string (syntax->datum #'colon-n))
1))))) 1)))))
(resolve-r6rs-interface (resolve-r6rs-interface
#`(library (srfi #,srfi-n (version ...)))))) #`(library (srfi #,srfi-n rest ... (version ...))))))
((library (name name* ... (version ...))) ((library (name name* ... (version ...)))
(and-map sym? #'(name name* ...)) (and-map sym? #'(name name* ...))