Cleanup ASPERL ifdefs

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 9f79c44aaaa2f474f2be2b36637e6f77e0769183..9f6cdd1de255743fc2658c49201354ca64cabbfe 100644 (file)
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -26,9 +26,7 @@ perl_back_add(
        int len;
        int count;
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
        ldap_pvt_thread_mutex_lock( &entry2str_mutex );
 

diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index d22d8c514fd418ccca4ed60a1360f67b90daadef..f6ae0a675c289dc3596752eaac82bf875da85127 100644 (file)
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -42,10 +42,7 @@ perl_back_bind(
                return rs->sr_err;
        }
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
-
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 0b5bcb1c4f6ba50f63dc50fb8241769f6c7d5fb3..8b9ea476643562db0f3a7ee788a2c4ba025d8537 100644 (file)
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -41,9 +41,7 @@ perl_back_compare(
                op->orc_ava->aa_desc->ad_cname.bv_val ), "=" ),
                op->orc_ava->aa_value.bv_val );
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {

diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index ffbf44f5354535f3573297eedcdbf17b28b7daa4..ee8eb798804054cde6f511732ed5da8a97d3be8b 100644 (file)
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -25,9 +25,7 @@ perl_back_delete(
        PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
        int count;
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {

diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 769ad17cfb0018990e8c4982df60d47268ba133c..228c4196a82eeb704b137a3350b3854c0ad1e748 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -27,10 +27,7 @@ perl_back_modify(
        int count;
        int i;
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
-
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 433d4dcf2e46d43cb891fabc8da9939fff544798..541fe0907b29fe1c36d51b12daebd877969f2437 100644 (file)
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -25,10 +25,7 @@ perl_back_modrdn(
        PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
        int count;
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
-
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {

diff --git a/servers/slapd/back-perl/perl_back.h b/servers/slapd/back-perl/perl_back.h
index b76c20b7a9e5ded9b6a89426149abae2bfe40841..71ee8bfafe1073519a25f6e26c01610785c1c4f6 100644 (file)
--- a/servers/slapd/back-perl/perl_back.h
+++ b/servers/slapd/back-perl/perl_back.h
@@ -61,6 +61,7 @@ extern ldap_pvt_thread_mutex_t  perl_interpreter_mutex;
 # define PERL_INTERPRETER                      perl_interpreter
 # define PERL_BACK_XS_INIT_PARAMS              void
 # define PERL_BACK_BOOT_DYNALOADER_PARAMS      CV *cv
+# define PERL_SET_CONTEXT(i)
 #endif
 
 extern PerlInterpreter *PERL_INTERPRETER;

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index 7d7553c244806f832428219d59d8e865c1c7635e..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 );  
 
        {