From d1cc334deb6794378c6f40d8a0bfdb3f1d65bda1 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Sat, 5 Feb 2011 00:48:22 +0000
Subject: [PATCH] Cleanup PERL_5_6 ifdefs

---
 servers/slapd/back-perl/add.c     | 4 ----
 servers/slapd/back-perl/bind.c    | 4 ----
 servers/slapd/back-perl/compare.c | 4 ----
 servers/slapd/back-perl/config.c  | 5 -----
 servers/slapd/back-perl/delete.c  | 4 ----
 servers/slapd/back-perl/init.c    | 4 ----
 servers/slapd/back-perl/modify.c  | 4 ----
 servers/slapd/back-perl/modrdn.c  | 4 ----
 servers/slapd/back-perl/search.c  | 4 ----
 9 files changed, 37 deletions(-)

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 5d5346c974..9f79c44aaa 100644
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -41,11 +41,7 @@ perl_back_add(
 
 		PUTBACK;
 
-#ifdef PERL_IS_5_6
 		count = call_method("add", G_SCALAR);
-#else
-		count = perl_call_method("add", G_SCALAR);
-#endif
 
 		SPAGAIN;
 
diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index c87c4f3f5e..d22d8c514f 100644
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -57,11 +57,7 @@ perl_back_bind(
 		XPUSHs(sv_2mortal(newSVpv( op->orb_cred.bv_val , op->orb_cred.bv_len)));
 		PUTBACK;
 
-#ifdef PERL_IS_5_6
 		count = call_method("bind", G_SCALAR);
-#else
-		count = perl_call_method("bind", G_SCALAR);
-#endif
 
 		SPAGAIN;
 
diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 7543d4b53e..0b5bcb1c4f 100644
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -55,11 +55,7 @@ perl_back_compare(
 		XPUSHs(sv_2mortal(newSVpv( avastr , 0)));
 		PUTBACK;
 
-#ifdef PERL_IS_5_6
 		count = call_method("compare", G_SCALAR);
-#else
-		count = perl_call_method("compare", G_SCALAR);
-#endif
 
 		SPAGAIN;
 
diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index a8b98a3943..adb89a76b8 100644
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -173,13 +173,8 @@ perl_cf(
 	} else {
 		switch( c->type ) {
 		case PERL_MODULE:
-#ifdef PERL_IS_5_6
 			snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", c->argv[1] );
 			eval_pv( eval_str, 0 );
-#else
-			snprintf( eval_str, EVAL_BUF_SIZE, "%s.pm", c->argv[1] );
-			perl_require_pv( eval_str );
-#endif /* PERL_IS_5_6 */
 
 			if (SvTRUE(ERRSV)) {
 				STRLEN len;
diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index 25566acbc6..ffbf44f535 100644
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -39,11 +39,7 @@ perl_back_delete(
 
 		PUTBACK;
 
-#ifdef PERL_IS_5_6
 		count = call_method("delete", G_SCALAR);
-#else
-		count = perl_call_method("delete", G_SCALAR);
-#endif
 
 		SPAGAIN;
 
diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index bb0d16f2e4..392084233f 100644
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -130,11 +130,7 @@ perl_back_db_open(
 
 		PUTBACK;
 
-#ifdef PERL_IS_5_6
 		count = call_method("init", G_SCALAR);
-#else
-		count = perl_call_method("init", G_SCALAR);
-#endif
 
 		SPAGAIN;
 
diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 603434c781..769ad17cfb 100644
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -75,11 +75,7 @@ perl_back_modify(
 
 		PUTBACK;
 
-#ifdef PERL_IS_5_6
 		count = call_method("modify", G_SCALAR);
-#else
-		count = perl_call_method("modify", G_SCALAR);
-#endif
 
 		SPAGAIN;
 
diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 2ccf1de084..433d4dcf2e 100644
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -44,11 +44,7 @@ perl_back_modrdn(
 		}
 		PUTBACK ;
 
-#ifdef PERL_IS_5_6
 		count = call_method("modrdn", G_SCALAR);
-#else
-		count = perl_call_method("modrdn", G_SCALAR);
-#endif
 
 		SPAGAIN ;
 
diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index 0d73f82ecb..7d7553c244 100644
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -57,11 +57,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;
 
-- 
2.39.5