From 579e7680468b2a7251b068a349a583796a3ef0ee Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Thu, 5 Jun 2003 11:44:06 +0000 Subject: [PATCH] #include Perl files before OpenLDAP files, and #undef _ (ITS#2513) --- servers/slapd/back-perl/add.c | 14 ++++++++------ servers/slapd/back-perl/asperl_undefs.h | 4 ++++ servers/slapd/back-perl/bind.c | 15 ++++++++------- servers/slapd/back-perl/close.c | 15 ++++++++------- servers/slapd/back-perl/compare.c | 14 ++++++++------ servers/slapd/back-perl/config.c | 14 ++++++++------ servers/slapd/back-perl/delete.c | 14 ++++++++------ servers/slapd/back-perl/init.c | 15 ++++++++------- servers/slapd/back-perl/modify.c | 14 ++++++++------ servers/slapd/back-perl/modrdn.c | 14 ++++++++------ servers/slapd/back-perl/search.c | 14 ++++++++------ 11 files changed, 84 insertions(+), 63 deletions(-) diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c index 8f41042c6e..b17e7cdfb5 100644 --- a/servers/slapd/back-perl/add.c +++ b/servers/slapd/back-perl/add.c @@ -13,17 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#include "portable.h" + +#include + +#include "slap.h" #include "perl_back.h" diff --git a/servers/slapd/back-perl/asperl_undefs.h b/servers/slapd/back-perl/asperl_undefs.h index fb3fdb612b..2d0ea25d90 100644 --- a/servers/slapd/back-perl/asperl_undefs.h +++ b/servers/slapd/back-perl/asperl_undefs.h @@ -2,6 +2,10 @@ * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ + +/* This file is probably obsolete. If it is not, */ +/* #inclusion of it may have to be moved. See ITS#2513. */ + /* This file is necessary because both PERL headers */ /* and OpenLDAP define a number of macros without */ /* checking wether they're already defined */ diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c index cee52ec5f3..a09825de7f 100644 --- a/servers/slapd/back-perl/bind.c +++ b/servers/slapd/back-perl/bind.c @@ -13,18 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" -/* init.c - initialize Perl backend */ - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#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 4ad62899ec..2e3252c3c1 100644 --- a/servers/slapd/back-perl/close.c +++ b/servers/slapd/back-perl/close.c @@ -13,18 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" -/* init.c - initialize shell backend */ - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#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 8218bb4168..1dfcb125f5 100644 --- a/servers/slapd/back-perl/compare.c +++ b/servers/slapd/back-perl/compare.c @@ -13,17 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#include "portable.h" + +#include + +#include "slap.h" #include "lutil.h" #include "perl_back.h" diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c index b33151cde3..ed9b961711 100644 --- a/servers/slapd/back-perl/config.c +++ b/servers/slapd/back-perl/config.c @@ -13,17 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#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 26e05363f3..9bc5126468 100644 --- a/servers/slapd/back-perl/delete.c +++ b/servers/slapd/back-perl/delete.c @@ -13,17 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#include "portable.h" + +#include + +#include "slap.h" #include "perl_back.h" diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c index 6096fc876d..1cec96af9e 100644 --- a/servers/slapd/back-perl/init.c +++ b/servers/slapd/back-perl/init.c @@ -13,18 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" - /* init.c - initialize shell backend */ - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#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 96c28fcb0c..f77f308752 100644 --- a/servers/slapd/back-perl/modify.c +++ b/servers/slapd/back-perl/modify.c @@ -13,17 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#include "portable.h" + +#include + +#include "slap.h" #include "perl_back.h" diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c index 20bdf3c8bd..2befbb6ee7 100644 --- a/servers/slapd/back-perl/modrdn.c +++ b/servers/slapd/back-perl/modrdn.c @@ -26,17 +26,19 @@ * */ -#include "portable.h" - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#include "portable.h" + +#include + +#include "slap.h" #include "perl_back.h" diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c index c070b46b0a..50230e6efc 100644 --- a/servers/slapd/back-perl/search.c +++ b/servers/slapd/back-perl/search.c @@ -13,17 +13,19 @@ * in file LICENSE in the top-level directory of the distribution. */ -#include "portable.h" - -#include +#include +#include +#undef _ /* #defined used by both Perl and ac/localize.h */ -#include "slap.h" #ifdef HAVE_WIN32_ASPERL #include "asperl_undefs.h" #endif -#include -#include +#include "portable.h" + +#include + +#include "slap.h" #include "perl_back.h" -- 2.39.5