Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 72150c9085e66586aa25742b76a23ae9f93e0363..0bd3dd6dfa219ac1d0715bb5484a32aed6860960 100644 (file)
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -15,22 +15,8 @@
  * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include <EXTERN.h>
-#include <perl.h>
-#undef _ /* #defined by both Perl and ac/localize.h */
-
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include "slap.h"
-
-#include "lutil.h"
 #include "perl_back.h"
+#include "lutil.h"
 
 /**********************************************************
  *
@@ -44,7 +30,7 @@ perl_back_compare(
        SlapReply       *rs )
 {
        int count;
-       char *avastr, *ptr;
+       char *avastr;
 
        PerlBackend *perl_back = (PerlBackend *)op->o_bd->be_private;
 
@@ -55,6 +41,7 @@ perl_back_compare(
                op->orc_ava->aa_desc->ad_cname.bv_val ), "=" ),
                op->orc_ava->aa_value.bv_val );
 
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -66,11 +53,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;