Cleanup PERL_5_6 ifdefs

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 5d5346c974d49fa549dc008c4c80e335a042bacb..9f79c44aaaa2f474f2be2b36637e6f77e0769183 100644 (file)
--- 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 c87c4f3f5e9cef1fb4aaffcf3effc67344389d6b..d22d8c514fd418ccca4ed60a1360f67b90daadef 100644 (file)
--- 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 7543d4b53ed9e96287c19f869431855c0eefe1a2..0b5bcb1c4f6ba50f63dc50fb8241769f6c7d5fb3 100644 (file)
--- 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 a8b98a394337319b54735310144f1ca6abcab75f..adb89a76b8a57b6afa12decef8d5b9cf0759ce3d 100644 (file)
--- 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 25566acbc6982230697fcdc97cf75cbbfe2b9f87..ffbf44f5354535f3573297eedcdbf17b28b7daa4 100644 (file)
--- 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 bb0d16f2e4849b97940abbc51fcb5ddbb5234211..392084233ffcae1af33b4359b10c63b45c84901a 100644 (file)
--- 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 603434c781c55220920235f19220f8d8c8d55085..769ad17cfb0018990e8c4982df60d47268ba133c 100644 (file)
--- 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 2ccf1de084f5a749e715c3dcdfe6bd68530e4245..433d4dcf2e46d43cb891fabc8da9939fff544798 100644 (file)
--- 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 0d73f82ecbca5d6c43ad7bd95e4106c4f0ef2c58..7d7553c244806f832428219d59d8e865c1c7635e 100644 (file)
--- 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;