Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index c2780933237eee8db0a24a1d9db1b5c8a7e607e9..9f6cdd1de255743fc2658c49201354ca64cabbfe 100644 (file)
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2011 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -15,20 +15,6 @@
  * <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 "perl_back.h"
 
 int
@@ -40,6 +26,7 @@ perl_back_add(
        int len;
        int count;
 
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
        ldap_pvt_thread_mutex_lock( &entry2str_mutex );
 
@@ -52,11 +39,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;