summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-11-08 00:50:47 +0100
committerAndy Wingo <wingo@pobox.com>2011-11-08 00:53:57 +0100
commit285ac79b1ae6c502841bd2d175445ec5c599aa1e (patch)
tree52e2b5a96c2628a744287ae438539f46356bd4ec
parent19b8d12b165a11d963507e0ed35307f4e719e653 (diff)
downloadguile-285ac79b1ae6c502841bd2d175445ec5c599aa1e.tar.gz
scm_c_lock_port takes a port
* libguile/ports.h (scm_c_lock_port, scm_c_try_lock_port) (scm_c_unlock_port): Take a port instead of an entry.
-rw-r--r--libguile/ports.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/libguile/ports.h b/libguile/ports.h
index 2118c1154..88a050abc 100644
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -294,9 +294,9 @@ SCM_API SCM scm_port_conversion_strategy (SCM port);
SCM_API SCM scm_set_port_conversion_strategy_x (SCM port, SCM behavior);
/* Acquiring and releasing the port lock. */
-SCM_INLINE int scm_c_lock_port (scm_t_port *entry);
-SCM_INLINE int scm_c_try_lock_port (scm_t_port *entry);
-SCM_INLINE int scm_c_unlock_port (scm_t_port *entry);
+SCM_INLINE int scm_c_lock_port (SCM port);
+SCM_INLINE int scm_c_try_lock_port (SCM port);
+SCM_INLINE int scm_c_unlock_port (SCM port);
/* Revealed counts. */
SCM_API int scm_revealed_count (SCM port);
@@ -367,30 +367,30 @@ SCM_INTERNAL void scm_init_ports (void);
#if SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES
SCM_INLINE_IMPLEMENTATION int
-scm_c_lock_port (scm_t_port *entry)
+scm_c_lock_port (SCM port)
{
#if SCM_USE_PTHREAD_THREADS
- return scm_i_pthread_mutex_lock (&entry->lock);
+ return scm_i_pthread_mutex_lock (&SCM_PTAB_ENTRY (port)->lock);
#else
return 0;
#endif
}
SCM_INLINE_IMPLEMENTATION int
-scm_c_try_lock_port (scm_t_port *entry)
+scm_c_try_lock_port (SCM port)
{
#if SCM_USE_PTHREAD_THREADS
- return scm_i_pthread_mutex_trylock (&entry->lock);
+ return scm_i_pthread_mutex_trylock (&SCM_PTAB_ENTRY (port)->lock);
#else
return 0;
#endif
}
SCM_INLINE_IMPLEMENTATION int
-scm_c_unlock_port (scm_t_port *entry)
+scm_c_unlock_port (SCM port)
{
#if SCM_USE_PTHREAD_THREADS
- return scm_i_pthread_mutex_unlock (&entry->lock);
+ return scm_i_pthread_mutex_unlock (&SCM_PTAB_ENTRY (port)->lock);
#else
return 0;
#endif