Merge branch 'stable-2.0'

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

diff --git a/libguile/async.h b/libguile/async.h
index 3da808e..00b7914 100644 (file)
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -3,7 +3,7 @@
 #ifndef SCM_ASYNC_H
 #define SCM_ASYNC_H
 
-/* Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2008, 2009,
+/* Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2008, 2009, 2011
  *   2014 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
 
 \f
 
-SCM_API void scm_async_click (void);
+SCM_API void scm_async_tick (void);
 SCM_API void scm_switch (void);
 SCM_API SCM scm_async (SCM thunk);
 SCM_API SCM scm_async_mark (SCM a);
@@ -76,7 +76,7 @@ SCM_API void scm_critical_section_end (void);
     SCM_I_CURRENT_THREAD->critical_section_level--;            \
     SCM_I_CURRENT_THREAD->block_asyncs--;                      \
     scm_i_pthread_mutex_unlock (&scm_i_critical_section_mutex); \
-    scm_async_click ();                                                \
+    scm_async_tick ();                                         \
   } while (0)
 
 # define scm_i_pthread_mutex_lock_block_asyncs(m)      \
@@ -104,14 +104,6 @@ SCM_API void scm_critical_section_end (void);
 
 SCM_INTERNAL void scm_init_async (void);
 
-#if (SCM_ENABLE_DEPRECATED == 1)
-
-SCM_DEPRECATED SCM scm_system_async (SCM thunk);
-SCM_DEPRECATED SCM scm_unmask_signals (void);
-SCM_DEPRECATED SCM scm_mask_signals (void);
-
-#endif
-
 #endif  /* SCM_ASYNC_H */
 
 /*