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

[bpt/guile.git] / libguile / promises.c

diff --git a/libguile/promises.c b/libguile/promises.c
index 45a76a9..dcd0ac3 100644 (file)
--- a/libguile/promises.c
+++ b/libguile/promises.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
  * Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
@@ -80,7 +80,7 @@ SCM_DEFINE (scm_make_promise, "make-promise", 1, 0, 0,
   SCM_VALIDATE_THUNK (1, thunk);
   SCM_RETURN_NEWSMOB2 (scm_tc16_promise,
                       SCM_UNPACK (thunk),
-                      scm_make_recursive_mutex ());
+                      SCM_UNPACK (scm_make_recursive_mutex ()));
 }
 #undef FUNC_NAME
 
@@ -88,18 +88,18 @@ static int
 promise_print (SCM exp, SCM port, scm_print_state *pstate)
 {
   int writingp = SCM_WRITINGP (pstate);
-  scm_puts ("#<promise ", port);
+  scm_puts_unlocked ("#<promise ", port);
   SCM_SET_WRITINGP (pstate, 1);
   scm_iprin1 (SCM_PROMISE_DATA (exp), port, pstate);
   SCM_SET_WRITINGP (pstate, writingp);
-  scm_putc ('>', port);
+  scm_putc_unlocked ('>', port);
   return !0;
 }
 
 SCM_DEFINE (scm_force, "force", 1, 0, 0, 
            (SCM promise),
-           "If the promise @var{x} has not been computed yet, compute and\n"
-           "return @var{x}, otherwise just return the previously computed\n"
+           "If @var{promise} has not been computed yet, compute and\n"
+           "return @var{promise}, otherwise just return the previously computed\n"
            "value.")
 #define FUNC_NAME s_scm_force
 {