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

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"
 

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 */

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"
 

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"
 

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"

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"
 

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"
 

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"
 

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"
 

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"
 

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"