happy new year

[openldap] / libraries / libldap_r / thr_cthreads.c

diff --git a/libraries/libldap_r/thr_cthreads.c b/libraries/libldap_r/thr_cthreads.c
index f6526b16ed083084e7a6c0ae9a0a27cac39bba83..b98a47afa2caa28f736207e6a19a7faa6c73e84f 100644 (file)
--- a/libraries/libldap_r/thr_cthreads.c
+++ b/libraries/libldap_r/thr_cthreads.c
@@ -1,35 +1,37 @@
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* thr_cthreads.c - wrapper for mach cthreads */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* This work was initially developed by Luke Howard for inclusion
+ * in U-MICH LDAP 3.3.
  */
-
-/* thr_cthreads.c - wrapper for mach cthreads */
 
 #include "portable.h"
 
 #if defined( HAVE_MACH_CTHREADS )
-#include "ldap_pvt_thread.h"
-
-/***********************************************************************
- *                                                                     *
- * under NEXTSTEP or OPENSTEP use CThreads                             *
- * lukeh@xedoc.com.au                                                  *
- *                                                                     *
- ***********************************************************************/
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#define LDAP_THREAD_IMPLEMENTATION
+#include "ldap_thr_debug.h"  /* May rename the symbols defined below */
 
 int
-ldap_pvt_thread_initialize( void )
+ldap_int_thread_initialize( void )
 {
        return 0;
 }
 
 int
-ldap_pvt_thread_destroy( void )
+ldap_int_thread_destroy( void )
 {
        return 0;
 }
@@ -53,7 +55,7 @@ int
 ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 {
        void *status;
-       status = (void *) cthread_join ( tid );
+       status = (void *) cthread_join ( thread );
        if (thread_return != NULL)
                {
                *thread_return = status;
@@ -145,4 +147,10 @@ ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mutex )
        return mutex_try_lock( mutex );
 }
 
+ldap_pvt_thread_t
+ldap_pvt_thread_self( void )
+{
+       return cthread_self();
+}
+
 #endif /* HAVE_MACH_CTHREADS */