From 510eb8dff22a44e551fdb85f58610c75747d7659 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 27 Apr 2004 07:23:04 +0000 Subject: [PATCH] Blind portability fix --- servers/slapd/back-perl/add.c | 14 -------------- servers/slapd/back-perl/bind.c | 14 -------------- servers/slapd/back-perl/close.c | 14 -------------- servers/slapd/back-perl/compare.c | 16 +--------------- servers/slapd/back-perl/config.c | 14 -------------- servers/slapd/back-perl/delete.c | 14 -------------- servers/slapd/back-perl/init.c | 14 -------------- servers/slapd/back-perl/modify.c | 14 -------------- servers/slapd/back-perl/modrdn.c | 14 -------------- servers/slapd/back-perl/perl_back.h | 11 ++++++++++- servers/slapd/back-perl/search.c | 14 -------------- 11 files changed, 11 insertions(+), 142 deletions(-) diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c index c278093323..8a89f8948d 100644 --- a/servers/slapd/back-perl/add.c +++ b/servers/slapd/back-perl/add.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" int diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c index 88e45988bb..f0c33c139b 100644 --- a/servers/slapd/back-perl/bind.c +++ b/servers/slapd/back-perl/bind.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" diff --git a/servers/slapd/back-perl/close.c b/servers/slapd/back-perl/close.c index 8a4139a8ae..d4773a49e0 100644 --- a/servers/slapd/back-perl/close.c +++ b/servers/slapd/back-perl/close.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" /********************************************************** diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c index 26218a1c39..15f4511561 100644 --- a/servers/slapd/back-perl/compare.c +++ b/servers/slapd/back-perl/compare.c @@ -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" /********************************************************** * diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c index daa701a319..8b40a3e79d 100644 --- a/servers/slapd/back-perl/config.c +++ b/servers/slapd/back-perl/config.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c index 388513daa2..63e774440e 100644 --- a/servers/slapd/back-perl/delete.c +++ b/servers/slapd/back-perl/delete.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" int diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c index 59dc3a06bc..8b512135bd 100644 --- a/servers/slapd/back-perl/init.c +++ b/servers/slapd/back-perl/init.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c index 56d69eb209..a29565b455 100644 --- a/servers/slapd/back-perl/modify.c +++ b/servers/slapd/back-perl/modify.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" int diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c index de81c6e40f..a378bd1a23 100644 --- a/servers/slapd/back-perl/modrdn.c +++ b/servers/slapd/back-perl/modrdn.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" int diff --git a/servers/slapd/back-perl/perl_back.h b/servers/slapd/back-perl/perl_back.h index 19a8b018c7..332d1dc390 100644 --- 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 +#include +#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 4e1264e5cb..69d0076b77 100644 --- a/servers/slapd/back-perl/search.c +++ b/servers/slapd/back-perl/search.c @@ -15,20 +15,6 @@ * . */ -#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 "perl_back.h" /********************************************************** -- 2.39.5