Misc updates from HEAD

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index 8cac0819e08f3e167b67b65dea1cbab8bd4e04b7..648ae715a90f507def5895c40b2e7d59e04c8b2f 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -175,7 +175,7 @@ perl_back_db_open(
 
 
 static void
-perl_back_xs_init()
+perl_back_xs_init(PERL_BACK_XS_INIT_PARAMS)
 {
        char *file = __FILE__;
        dXSUB_SYS;

diff --git a/servers/slapd/back-perl/perl_back.h b/servers/slapd/back-perl/perl_back.h
index 232364492a425d445bb36329287f595ddfa69660..03c7d2153b372ce01e12517e7b3a0bb2fbece03b 100644 (file)
--- a/servers/slapd/back-perl/perl_back.h
+++ b/servers/slapd/back-perl/perl_back.h
@@ -5,28 +5,25 @@
 LDAP_BEGIN_DECL
 
 /*
- * From Apache mod_perl: test for Perl version.[ja
+ * From Apache mod_perl: test for Perl version.
  */
-#ifdef pTHX_
+
+#if defined(pTHX_) || (PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 6))
 #define PERL_IS_5_6
 #endif
 
 #define EVAL_BUF_SIZE 500
 
-#ifdef pTHX_
-#define PERL_IS_5_6
-#endif
-
 extern ldap_pvt_thread_mutex_t  perl_interpreter_mutex;
 
-#ifdef HAVE_WIN32_ASPERL
+#ifdef PERL_IS_5_6
 /* We should be using the PL_errgv, I think */
 /* All the old style variables are prefixed with PL_ now */
 # define errgv PL_errgv
 # define na    PL_na
 #endif
 
-#ifdef HAVE_WIN32_ASPERL 
+#ifdef HAVE_WIN32_ASPERL
 /* pTHX is needed often now */
 # define PERL_INTERPRETER                      my_perl
 # define PERL_BACK_XS_INIT_PARAMS              pTHX