Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-perl / search.c

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index 0d73f82ecbca5d6c43ad7bd95e4106c4f0ef2c58..9d209ebd9831080ede33c35cb576f1e41191fa0f 100644 (file)
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -34,9 +34,7 @@ perl_back_search(
        char *buf;
        int i;
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -57,11 +55,7 @@ perl_back_search(
                }
                PUTBACK;
 
-#ifdef PERL_IS_5_6
                count = call_method("search", G_ARRAY );
-#else
-               count = perl_call_method("search", G_ARRAY );
-#endif
 
                SPAGAIN;