(exception:string-contains-nul): New exception pattern.

[bpt/guile.git] / libguile / pthread-threads.h

diff --git a/libguile/pthread-threads.h b/libguile/pthread-threads.h
index b6a820a..015a707 100644 (file)
--- a/libguile/pthread-threads.h
+++ b/libguile/pthread-threads.h
@@ -3,7 +3,7 @@
 #ifndef SCM_PTHREADS_THREADS_H
 #define SCM_PTHREADS_THREADS_H
 
-/* Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -66,8 +66,12 @@ extern pthread_mutexattr_t scm_i_pthread_mutexattr_recursive[1];
 /* Onces
  */
 #define scm_i_pthread_once_t                pthread_once_t
-#define SCM_I_PTHREAD_ONCE_INIT             PTHREAD_ONCE_INIT
 #define scm_i_pthread_once                  pthread_once
+#if SCM_NEED_BRACES_ON_PTHREAD_ONCE_INIT
+#define SCM_I_PTHREAD_ONCE_INIT             { PTHREAD_ONCE_INIT }
+#else
+#define SCM_I_PTHREAD_ONCE_INIT             PTHREAD_ONCE_INIT
+#endif
 
 /* Thread specific storage
  */
@@ -79,7 +83,7 @@ extern pthread_mutexattr_t scm_i_pthread_mutexattr_recursive[1];
 /* Convenience functions
  */
 #define scm_i_scm_pthread_mutex_lock        scm_pthread_mutex_lock
-#define scm_i_frame_pthread_mutex_lock      scm_frame_pthread_mutex_lock
+#define scm_i_dynwind_pthread_mutex_lock    scm_dynwind_pthread_mutex_lock
 #define scm_i_scm_pthread_cond_wait         scm_pthread_cond_wait
 #define scm_i_scm_pthread_cond_timedwait    scm_pthread_cond_timedwait