michael@174: Index: include/ac/fdset.h michael@174: --- include/ac/fdset.h.orig 2008-02-12 00:26:40 +0100 michael@174: +++ include/ac/fdset.h 2008-10-13 11:38:23 +0200 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 michael@174: +#endif michael@174: +#if defined(HAVE_SYS_SELECT_H) michael@174: +#include 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@174: --- include/ldap_int_thread.h.orig 2008-02-12 00:26:40 +0100 michael@174: +++ include/ldap_int_thread.h 2008-10-13 11:38:23 +0200 michael@174: @@ -100,6 +100,7 @@ michael@174: * * michael@174: ***********************************/ michael@174: michael@174: +#define _POSIX_PTHREAD_SEMANTICS michael@174: #define PTH_SYSCALL_SOFT 1 michael@174: #include michael@174: michael@174: Index: libraries/libldap_r/tpool.c michael@174: --- libraries/libldap_r/tpool.c.orig 2008-03-21 01:46:03 +0100 michael@174: +++ libraries/libldap_r/tpool.c 2008-10-13 11:38:23 +0200 michael@174: @@ -950,6 +950,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@174: --- servers/slapd/back-perl/config.c.orig 2008-02-12 00:26:47 +0100 michael@174: +++ servers/slapd/back-perl/config.c 2008-10-13 11:38:23 +0200 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: