X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fcompare.c;h=0bd3dd6dfa219ac1d0715bb5484a32aed6860960;hb=9547dd7a0d9fd079e6e75fb59b20a2fc661c9782;hp=72150c9085e66586aa25742b76a23ae9f93e0363;hpb=da6d557cdc2c62e36ba8a2c7f4f3c97ad8b630f1;p=openldap
diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 72150c9085..0bd3dd6dfa 100644
--- 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 .
*
- * 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 @@
* .
*/
-#include
-#include
-#undef _ /* #defined by both Perl and ac/localize.h */
-
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include "portable.h"
-
-#include
-
-#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;