Blind portability fix

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index c2780933237eee8db0a24a1d9db1b5c8a7e607e9..8a89f8948dfbcc55eb80e9ee3391ae939a116021 100644 (file)
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -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

diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index 88e45988bb94ca418dd9fec084e25840b791c2c0..f0c33c139be79bb3055516aaabf57bb087b9451a 100644 (file)
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -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"
 
 

diff --git a/servers/slapd/back-perl/close.c b/servers/slapd/back-perl/close.c
index 8a4139a8ae9b8102de5d263e319ec473e524339b..d4773a49e0923c4a153da1ffad7cdc4ea898b3a4 100644 (file)
--- a/servers/slapd/back-perl/close.c
+++ b/servers/slapd/back-perl/close.c
@@ -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"
 
 /**********************************************************

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 26218a1c394833915876eca851d598d2a02d7bb7..15f45115613de4930623582d2a90911701a5cd3d 100644 (file)
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -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"
 
 /**********************************************************
  *

diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index daa701a31904887c0aa1212b9fe8ae032570f08b..8b40a3e79d3d7c046527be198e059b76c95a059e 100644 (file)
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -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"
 
 

diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index 388513daa25e2f4705edd6a23f1a1973d42165d6..63e774440e5979d4c8e9993da937218fdb0d35ba 100644 (file)
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -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

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index 59dc3a06bc371c659cfcffd8c2bed53da3687c27..8b512135bd071e0b20bbb52bdd6cf01b60801def 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -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"
 
 

diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 56d69eb2099d16b06222749bc46b2493694381d9..a29565b455df63cb22845a46a91a8893fb12859e 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -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

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index de81c6e40fdb65b300d983850ec5e9d441d9d225..a378bd1a23910493d1fab7a1d56eabb108a6d40d 100644 (file)
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -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

diff --git a/servers/slapd/back-perl/perl_back.h b/servers/slapd/back-perl/perl_back.h
index 19a8b018c7dca47021803e7cff1765a0812d391e..332d1dc390ee5949206ccb7c83d1987886f17480 100644 (file)
--- a/servers/slapd/back-perl/perl_back.h
+++ b/servers/slapd/back-perl/perl_back.h
@@ -18,6 +18,15 @@
 #ifndef PERL_BACK_H
 #define PERL_BACK_H 1
 
+#include <EXTERN.h>
+#include <perl.h>
+#undef _       /* #defined by both Perl and ac/localize.h */
+#include "asperl_undefs.h"
+
+#include "portable.h"
+
+#include "slap.h"
+
 LDAP_BEGIN_DECL
 
 /*
@@ -39,7 +48,7 @@ extern ldap_pvt_thread_mutex_t  perl_interpreter_mutex;
 # define na    PL_na
 #endif
 
-#ifdef HAVE_WIN32_ASPERL
+#if defined( HAVE_WIN32_ASPERL ) || defined( USE_ITHREADS )
 /* pTHX is needed often now */
 # define PERL_INTERPRETER                      my_perl
 # define PERL_BACK_XS_INIT_PARAMS              pTHX

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index 4e1264e5cbf16978f3f81863bf347d698b91288e..69d0076b7742b450f6b3b85e9764cc1c646a4e6f 100644 (file)
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -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"
 
 /**********************************************************