(scm_random_solid_sphere_x): Use scm_c_generalized_vector_length

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

diff --git a/libguile/async.c b/libguile/async.c
index 276292a..35e8a5a 100644 (file)
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -149,7 +149,7 @@ scm_async_click ()
   if (scm_root->block_asyncs == 0)
     {
       SCM asyncs;
-      while (!SCM_NULLP(asyncs = scm_root->active_asyncs))
+      while (!scm_is_null(asyncs = scm_root->active_asyncs))
        {
          scm_root->active_asyncs = SCM_EOL;
          do
@@ -157,12 +157,12 @@ scm_async_click ()
              scm_call_0 (SCM_CAR (asyncs));
              asyncs = SCM_CDR (asyncs);
            }
-         while (!SCM_NULLP(asyncs));
+         while (!scm_is_null(asyncs));
        }
-      for (asyncs = scm_root->signal_asyncs; !SCM_NULLP(asyncs);
+      for (asyncs = scm_root->signal_asyncs; !scm_is_null(asyncs);
           asyncs = SCM_CDR (asyncs))
        {
-         if (!SCM_FALSEP (SCM_CAR (asyncs)))
+         if (scm_is_true (SCM_CAR (asyncs)))
            {
              SCM proc = SCM_CAR (asyncs);
              SCM_SETCAR (asyncs, SCM_BOOL_F);
@@ -365,20 +365,20 @@ scm_c_call_with_unblocked_asyncs (void *(*proc) (void *data), void *data)
 }
 
 void
-scm_with_blocked_asyncs ()
+scm_frame_block_asyncs ()
 {
-  scm_on_rewind (increase_block, NULL, SCM_F_WIND_EXPLICITLY);
-  scm_on_unwind (decrease_block, NULL, SCM_F_WIND_EXPLICITLY);
+  scm_frame_rewind_handler (increase_block, NULL, SCM_F_WIND_EXPLICITLY);
+  scm_frame_unwind_handler (decrease_block, NULL, SCM_F_WIND_EXPLICITLY);
 }
 
 void
-scm_with_unblocked_asyncs ()
+scm_frame_unblock_asyncs ()
 {
   if (scm_root->block_asyncs == 0)
     scm_misc_error ("scm_with_unblocked_asyncs", 
                    "asyncs already unblocked", SCM_EOL);
-  scm_on_rewind (decrease_block, NULL, SCM_F_WIND_EXPLICITLY);
-  scm_on_unwind (increase_block, NULL, SCM_F_WIND_EXPLICITLY);
+  scm_frame_rewind_handler (decrease_block, NULL, SCM_F_WIND_EXPLICITLY);
+  scm_frame_unwind_handler (increase_block, NULL, SCM_F_WIND_EXPLICITLY);
 }