#include Perl files before OpenLDAP files, and #undef _ (ITS#2513)

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 8f41042c6e61fedf795249d1b1a91495ec3c80ae..b17e7cdfb5a8669a7d07452701511b96cb375b9f 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#include "portable.h"
+
+#include <stdio.h>
+
+#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 fb3fdb612bfdd90e387bc8c2fac1660d15cdc65b..2d0ea25d90d4ab4badb369edf65391a17e0190f8 100644 (file)
--- 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 cee52ec5f368e39fdb6b4a0872ba092b00a5f490..a09825de7ffc2fadfa621321ab28df1bb17665fd 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#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 4ad62899ecc4f5e25108892bef7d10c0ffa95c08..2e3252c3c1a12bed75f64500bc3b04cece67bf3a 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#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 8218bb41682a9830a43ba6a35dfc6744ff0e47d1..1dfcb125f57f5b26256f63264623e28cf7bbb45f 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#include "portable.h"
+
+#include <stdio.h>
+
+#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 b33151cde33e4a050c9bb77e2cfa5f15ee7093fa..ed9b9617113b2b92c5e0b18875d994a003ac45ac 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#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 26e05363f3e0b4cac0c41c4465538d683757b2f0..9bc51264686ff80073eae10ff08a0acd760d4aa3 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#include "portable.h"
+
+#include <stdio.h>
+
+#include "slap.h"
 
 #include "perl_back.h"
 

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index 6096fc876d4875719e4b44b566e7c852018c8867..1cec96af9eaf73a7e2d4f96c757fb042c27fb33b 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#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 96c28fcb0c29aca860b1bd4cbc4ea2033e14c648..f77f3087525a73df3f4362acbef19dcb9b18deed 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#include "portable.h"
+
+#include <stdio.h>
+
+#include "slap.h"
 
 #include "perl_back.h"
 

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 20bdf3c8bdb44adff56dd87cdebc4cd64d34fc00..2befbb6ee7c8ff4669ffc14122a34302c582944d 100644 (file)
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -26,17 +26,19 @@
  *
  */
 
-#include "portable.h"
-
-#include <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#include "portable.h"
+
+#include <stdio.h>
+
+#include "slap.h"
 
 #include "perl_back.h"
 

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index c070b46b0a1c51ce616ba5b937f744e641185ec4..50230e6efc4d6595d542387fe36d39e87c6ce412 100644 (file)
--- 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 <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined used by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#include "portable.h"
+
+#include <stdio.h>
+
+#include "slap.h"
 
 #include "perl_back.h"