From: Howard Chu <hyc@openldap.org>
Date: Sat, 5 Feb 2011 00:51:18 +0000 (+0000)
Subject: Cleanup ASPERL ifdefs
X-Git-Tag: MIGRATION_CVS2GIT~90
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3a8720d3dbdfa003fe3902f557e86eea9916cb71;p=openldap

Cleanup ASPERL ifdefs
---

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 9f79c44aaa..9f6cdd1de2 100644
--- 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 d22d8c514f..f6ae0a675c 100644
--- 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 0b5bcb1c4f..8b9ea47664 100644
--- 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 ffbf44f535..ee8eb79880 100644
--- 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 769ad17cfb..228c4196a8 100644
--- 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 433d4dcf2e..541fe0907b 100644
--- 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 b76c20b7a9..71ee8bfafe 100644
--- 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 7d7553c244..9d209ebd98 100644
--- 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 );	
 
 	{