Fix unparse in prev commit

[openldap] / libraries / libldap_r / thr_lwp.c

diff --git a/libraries/libldap_r/thr_lwp.c b/libraries/libldap_r/thr_lwp.c
index 11488b8142579895ab3405193801b45505473831..3dabfe4fb725c197362bbdf54a721970a7f75f9d 100644 (file)
--- a/libraries/libldap_r/thr_lwp.c
+++ b/libraries/libldap_r/thr_lwp.c
@@ -1,16 +1,19 @@
+/* thr_lwp.c - wrappers around SunOS LWP threads */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2009 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>.
  */
 
-/* thr_lwp.c - wrappers around SunOS LWP threads */
-
 /* BUGS:
  * - slurpd calls the get_stack/free_stack functions. Should be fixed, so
  *   they can become static.
@@ -35,7 +38,9 @@
 
 #include "ldap-int.h"
 
-#include "ldap_pvt_thread.h"
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#define LDAP_THREAD_IMPLEMENTATION
+#include "ldap_thr_debug.h"     /* May rename the symbols defined below */
 
 #include <lwp/lwp.h>
 #include <lwp/stackdep.h>
@@ -64,7 +69,7 @@ ldap_int_thread_initialize( void )
 int
 ldap_int_thread_destroy( void )
 {
-       /* need to destory lwp_scheduler thread and clean up private
+       /* need to destroy lwp_scheduler thread and clean up private
                variables */
        return 0;
 }
@@ -308,7 +313,7 @@ ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
 
 int 
 ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond, 
-       ldap_int_thread_mutex_t *mutex )
+       ldap_pvt_thread_mutex_t *mutex )
 {
        if ( ! cond->lcv_created ) {
                cv_create( &cond->lcv_cv, *mutex );
@@ -360,4 +365,14 @@ ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cv )
        return( cv->lcv_created ? cv_broadcast( cv->lcv_cv ) : 0 );
 }
 
+ldap_pvt_thread_t
+ldap_pvt_thread_self( void )
+{
+       thread_t                mylwp;
+
+       lwp_self( &mylwp );
+
+       return mylwp;
+}
+
 #endif /* HAVE_LWP */