michael@174: Index: include/ac/fdset.h
michael@380: --- include/ac/fdset.h.orig	2011-01-05 00:49:56.000000000 +0100
michael@380: +++ include/ac/fdset.h	2011-02-12 10:17:43.000000000 +0100
michael@174: @@ -22,6 +22,13 @@
michael@174:  #ifndef _AC_FDSET_H
michael@174:  #define _AC_FDSET_H
michael@174:  
michael@174: +#if defined(HAVE_SYS_TYPES_H)
michael@174: +#include <sys/types.h>
michael@174: +#endif
michael@174: +#if defined(HAVE_SYS_SELECT_H)
michael@174: +#include <sys/select.h>
michael@174: +#endif
michael@174: +
michael@174:  #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE )
michael@174:  #  define OPENLDAP_FD_SETSIZE 4096
michael@174:  #endif
michael@174: Index: include/ldap_int_thread.h
michael@380: --- include/ldap_int_thread.h.orig	2011-01-06 19:43:20.000000000 +0100
michael@380: +++ include/ldap_int_thread.h	2011-02-12 10:17:43.000000000 +0100
michael@380: @@ -110,6 +110,7 @@
michael@174:   *                                 *
michael@174:   ***********************************/
michael@174:  
michael@174: +#define _POSIX_PTHREAD_SEMANTICS
michael@174:  #define PTH_SYSCALL_SOFT 1
michael@174:  #include <pth.h>
michael@174:  
michael@174: Index: libraries/libldap_r/tpool.c
michael@380: --- libraries/libldap_r/tpool.c.orig	2011-01-05 00:50:08.000000000 +0100
michael@380: +++ libraries/libldap_r/tpool.c	2011-02-12 10:17:43.000000000 +0100
michael@380: @@ -968,6 +968,6 @@
michael@174:  {
michael@174:  	ldap_int_thread_userctx_t *ctx = vctx;
michael@174:  
michael@174: -	return ctx->ltu_id;
michael@174: +	return ctx != NULL ? ctx->ltu_id : 0;
michael@174:  }
michael@174:  #endif /* LDAP_THREAD_HAVE_TPOOL */
michael@174: Index: servers/slapd/back-perl/config.c
michael@380: --- servers/slapd/back-perl/config.c.orig	2011-01-05 00:50:41.000000000 +0100
michael@380: +++ servers/slapd/back-perl/config.c	2011-02-12 10:17:43.000000000 +0100
michael@174: @@ -49,6 +49,9 @@
michael@174:  		}
michael@174:  
michael@174:  #ifdef PERL_IS_5_6
michael@174: +		if (argc > 2)
michael@174: +		    snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", argv[2] );
michael@174: +		else
michael@174:  		snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] );
michael@174:  		eval_pv( eval_str, 0 );
michael@174: