From eea0c8d35fb30c00c1baeb0152aa41a894d00906 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 14 Dec 2004 12:13:43 +0000
Subject: Revert previous -- -current's sched_yield has been fixed. adam says
 ok.

---
 databases/openldap/distinfo         |  4 ++--
 databases/openldap/patches/patch-ac | 19 ++++---------------
 2 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'databases/openldap')

diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 94a158746f2..820523cc3ae 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.32 2004/12/14 09:08:37 adam Exp $
+$NetBSD: distinfo,v 1.33 2004/12/14 12:13:43 wiz Exp $
 
 SHA1 (openldap-2.2.18.tgz) = df7b681c2480aea39560b22e8b0c7d118915a8f1
 Size (openldap-2.2.18.tgz) = 2574691 bytes
-SHA1 (patch-ac) = 7eb78bdd4359e015a56b0dbde3ab34fec5f1fb32
+SHA1 (patch-ac) = f3d5edf5ddbad93d7a88a6837ea962820fc475ce
 SHA1 (patch-ad) = c49ccf52a60110a6fe16afaff0d327e112216c50
 SHA1 (patch-af) = cd7c9527272dadf4509c4df1388d353378cdba13
 SHA1 (patch-ag) = 4dcbfa758f8c69193a69cb1cc018565a54789939
diff --git a/databases/openldap/patches/patch-ac b/databases/openldap/patches/patch-ac
index c23aa4d9cc4..82c3150209b 100644
--- a/databases/openldap/patches/patch-ac
+++ b/databases/openldap/patches/patch-ac
@@ -1,25 +1,14 @@
-$NetBSD: patch-ac,v 1.6 2004/12/14 09:08:37 adam Exp $
+$NetBSD: patch-ac,v 1.7 2004/12/14 12:13:43 wiz Exp $
 
---- libraries/libldap_r/thr_posix.c.orig	2004-01-01 18:16:30.000000000 +0000
+--- libraries/libldap_r/thr_posix.c.orig	Thu Jan  1 13:16:30 2004
 +++ libraries/libldap_r/thr_posix.c
-@@ -112,8 +112,10 @@ ldap_pvt_thread_create( ldap_pvt_thread_
+@@ -112,7 +112,9 @@ ldap_pvt_thread_create( ldap_pvt_thread_
  
  #if defined(LDAP_PVT_THREAD_STACK_SIZE) && LDAP_PVT_THREAD_STACK_SIZE > 0
  	/* this should be tunable */
 +#if defined(_POSIX_THREAD_ATTR_STACKSIZE)
  	pthread_attr_setstacksize( &attr, LDAP_PVT_THREAD_STACK_SIZE );
- #endif
 +#endif
+ #endif
  
  #if HAVE_PTHREADS > 5
- 	detach = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE;
-@@ -190,7 +192,8 @@ ldap_pvt_thread_yield( void )
- 	return thr_yield();
- 
- #elif HAVE_PTHREADS == 10
--	return sched_yield();
-+	sched_yield();
-+	return 0;
- 
- #elif defined(_POSIX_THREAD_IS_GNU_PTH)
- 	sched_yield();
-- 
cgit v1.2.3