From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 9 Nov 1998 21:15:56 +0000 (+0000)
Subject: Update thread detection:
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~1151
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f4b479b2b70aec07b7a2bae1973f9050c3811dc;p=openldap

Update thread detection:
  ifndef HAVE_PTHREAD_KILL pthread_kill() code and prototype.
  Fix HAVE_FUNC_PTHREAD defines from previous change.
---

diff --git a/include/lthread.h b/include/lthread.h
index 6f42d21f5c..e919bfb954 100644
--- a/include/lthread.h
+++ b/include/lthread.h
@@ -19,22 +19,27 @@
 
 LDAP_BEGIN_DECL
 
-#if !defined( HAVE_FUNC_PTHREAD_ATTR_INIT ) && \
-	defined( HAVE_FUNC_PTHREAD_ATTR_CREATE )
+#if !defined( HAVE_PTHREAD_ATTR_INIT ) && \
+	defined( HAVE_PTHREAD_ATTR_CREATE )
 #define pthread_attr_init( a )		pthread_attr_create( a )
 #endif
 
-#if !defined( HAVE_FUNC_PTHREAD_ATTR_DESTROY ) && \
-	defined( HAVE_FUNC_PTHREAD_ATTR_DELETE )
+#if !defined( HAVE_PTHREAD_ATTR_DESTROY ) && \
+	defined( HAVE_PTHREAD_ATTR_DELETE )
 #define pthread_attr_destroy( a )	pthread_attr_delete( a )
 #endif
 
-#if !defined( HAVE_FUNC_PTHREAD_ATTR_SETDETACHSTATE ) && \
-	defined( HAVE_FUNC_PTHREAD_ATTR_SETDETACHSTATE_NP )
+#if !defined( HAVE_PTHREAD_ATTR_SETDETACHSTATE ) && \
+	defined( HAVE_PTHREAD_ATTR_SETDETACHSTATE_NP )
 #define pthread_attr_setdetachstate( a, b ) \
 					pthread_attr_setdetach_np( a, b )
 #endif
 
+#ifndef HAVE_PTHREAD_KILL
+/* missing pthread_kill(), define prototype */
+LDAP_F void pthread_kill LDAP_P(( pthread_t tid, int sig ));
+#endif
+
 #ifndef HAVE_PTHREADS_D4
 #define pthread_mutexattr_default	NULL
 #define pthread_condattr_default	NULL
diff --git a/libraries/liblthread/thread.c b/libraries/liblthread/thread.c
index 1ba34ff86b..68baf5f30f 100644
--- a/libraries/liblthread/thread.c
+++ b/libraries/liblthread/thread.c
@@ -6,7 +6,7 @@
 
 #if defined( HAVE_PTHREADS )
 
-#ifdef HAVE_DCE
+#ifndef HAVE_PTHREAD_KILL
 /***********************************************************************
  *                                                                     *
  * pthreads package with DCE - no mapping to do (except to create a    *
@@ -20,7 +20,7 @@ pthread_kill( pthread_t tid, int sig )
 {
 	kill( getpid(), sig );
 }
-#endif /* DCE */
+#endif /* HAVE_PTHREAD_KILL */
 
 #elif defined( HAVE_MACH_CTHREADS )