Notices and acknowledgements

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

diff --git a/servers/slapd/back-perl/close.c b/servers/slapd/back-perl/close.c
index b3c407927c660150ed5321399df8e07222fb89d0..30afe22994dd6af3aae9d8c13b8709b8e3d4619d 100644 (file)
--- a/servers/slapd/back-perl/close.c
+++ b/servers/slapd/back-perl/close.c
@@ -1,7 +1,11 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  *      Copyright 1999, John C. Quillan, All rights reserved.
- *      Portions Copyright 2002, myinternet pty ltd. All rights reserved.
+ *      Portions Copyright 2002, myinternet Limited. All rights reserved.
  *
  *      Redistribution and use in source and binary forms are permitted only
  *      as authorized by the OpenLDAP Public License.  A copy of this
@@ -9,18 +13,20 @@
  *      in file LICENSE in the top-level directory of the distribution.
  */
 
+#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"
-/* init.c - initialize shell backend */
        
 #include <stdio.h>
-/*     #include <ac/types.h>
-       #include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
 
 #include "slap.h"
+
 #include "perl_back.h"
 
 /**********************************************************
@@ -36,7 +42,7 @@ perl_back_close(
 {
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
-       perl_destruct(perl_interpreter);
+       perl_destruct(PERL_INTERPRETER);
 
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
@@ -48,8 +54,8 @@ perl_back_destroy(
        BackendInfo *bd
 )
 {
-       perl_free(perl_interpreter);
-       perl_interpreter = NULL;
+       perl_free(PERL_INTERPRETER);
+       PERL_INTERPRETER = NULL;
 
        ldap_pvt_thread_mutex_destroy( &perl_interpreter_mutex );