From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 21 Nov 2008 19:51:50 +0000 (+0000)
Subject: ITS#5824
X-Git-Tag: OPENLDAP_REL_ENG_2_4_13~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=debfd2d796fd47481e077dff97fb38b21b030af7;p=openldap

ITS#5824
---

diff --git a/CHANGES b/CHANGES
index 9bb6cee824..45f337abb6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ OpenLDAP 2.4.13 Release (2008/11/20)
 	Fixed slapacl crasher (ITS#5820)
 	Fixed slapd acl checks on ADD (ITS#4556,ITS#5723)
 	Fixed slapd acl application to newly created backends (ITS#5572)
+	Fixed slapd #if/#elif issues in thread includes (ITS#5824)
 	Added slapd keyword add_content_acl for add checks (ITS#4556,ITS#5723)
 	Fixed slapd concurrent access to connections (ITS#5814)
 	Fixed slapd config backend olcLogFile support (ITS#5765)
diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h
index f1f72abf75..75899e51e8 100644
--- a/include/ldap_int_thread.h
+++ b/include/ldap_int_thread.h
@@ -80,7 +80,7 @@ LDAP_END_DECL
 
 #if defined( HAVE_MACH_CTHREADS_H )
 #	include <mach/cthreads.h>
-#elif defined( HAVE_CTHREAD_H
+#elif defined( HAVE_CTHREADS_H )
 #	include <cthreads.h>
 #endif
 
diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 1325e77226..7dc34c217a 100644
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -59,12 +59,12 @@ ldap_pvt_thread_set_concurrency LDAP_P(( int ));
 
 #ifndef LDAP_PVT_THREAD_H_DONE
 #define	LDAP_PVT_THREAD_SET_STACK_SIZE
-#ifndef LDAP_PVT_THREAD_STACK_SIZE
+/* The size may be explicitly #defined to zero to disable it. */
+#if defined( LDAP_PVT_THREAD_STACK_SIZE ) && LDAP_PVT_THREAD_STACK_SIZE == 0
+#	undef LDAP_PVT_THREAD_SET_STACK_SIZE
+#elif !defined( LDAP_PVT_THREAD_STACK_SIZE )
 	/* LARGE stack. Will be twice as large on 64 bit machine. */
-#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
-/* May be explicitly defined to zero to disable it */
-#elif LDAP_PVT_THREAD_STACK_SIZE == 0
-#undef LDAP_PVT_THREAD_SET_STACK_SIZE
+#	define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) )
 #endif
 #endif /* !LDAP_PVT_THREAD_H_DONE */