CVS HEAD: Rationalize libltdl header inclusion

[Bob Friesenhahn]

In order for libltdl to reliably compile using a user-provided 
configuration header (i.e. when libltdl is a subordinate build), it 
needs to include the user-provided configuration header prior to any 
system header.  Otherwise large file support or other features may not 
be handled consistently.  The resolution to this is to always include 
lt__private.h first since it includes the user configuration header.

Ok to apply?

Bob

2007-07-04  Bob Friesenhahn  <address@hidden>

        * libltdl/lt__alloc.c, libltdl/loaders/preopen.c,
        libltdl/loaders/dyld.c, libltdl/loaders/dlopen.c, libltdl/ltdl.c,
        libltdl/lt_error.c, libltdl/lt_dlloader.c, libltdl/lt__dirent.c:
        Include lt__private.h prior to any system headers.
        * libltdl/lt__alloc.c: Remove redundant inclusion of configuration
        header.


Index: libltdl/lt__alloc.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/lt__alloc.c,v
retrieving revision 1.10
diff -u -r1.10 lt__alloc.c
--- libltdl/lt__alloc.c 25 Mar 2007 12:12:42 -0000      1.10
+++ libltdl/lt__alloc.c 4 Jul 2007 17:35:17 -0000
@@ -28,16 +28,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#if defined(LT_CONFIG_H)
-#  include LT_CONFIG_H
-#else
-#  include <config.h>
-#endif
+#include "lt__private.h"

 #include <stdio.h>

 #include "lt__alloc.h"
-#include "lt__private.h"

 static void alloc_die_default (void);

Index: libltdl/lt__dirent.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/lt__dirent.c,v
retrieving revision 1.6
diff -u -r1.6 lt__dirent.c
--- libltdl/lt__dirent.c        25 Mar 2007 12:12:42 -0000      1.6
+++ libltdl/lt__dirent.c        4 Jul 2007 17:35:17 -0000
@@ -28,10 +28,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

+#include "lt__private.h"
+
 #include <assert.h>
 #include <stddef.h>

-#include "lt__private.h"
 #include "lt__dirent.h"

 #if defined(__WINDOWS__)
Index: libltdl/lt_dlloader.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/lt_dlloader.c,v
retrieving revision 1.10
diff -u -r1.10 lt_dlloader.c
--- libltdl/lt_dlloader.c       24 Jun 2007 20:46:45 -0000      1.10
+++ libltdl/lt_dlloader.c       4 Jul 2007 17:35:17 -0000
@@ -28,8 +28,8 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "lt_dlloader.h"
 #include "lt__private.h"
+#include "lt_dlloader.h"

 #define RETURN_SUCCESS 0
 #define RETURN_FAILURE 1
Index: libltdl/lt_error.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/lt_error.c,v
retrieving revision 1.8
diff -u -r1.8 lt_error.c
--- libltdl/lt_error.c  25 Mar 2007 12:12:42 -0000      1.8
+++ libltdl/lt_error.c  4 Jul 2007 17:35:17 -0000
@@ -28,8 +28,8 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "lt_error.h"
 #include "lt__private.h"
+#include "lt_error.h"

 static const char      *last_error     = 0;
 static const char      error_strings[LT_ERROR_MAX][LT_ERROR_LEN_MAX + 1] =
Index: libltdl/ltdl.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/ltdl.c,v
retrieving revision 1.252
diff -u -r1.252 ltdl.c
--- libltdl/ltdl.c      1 Jul 2007 06:12:46 -0000       1.252
+++ libltdl/ltdl.c      4 Jul 2007 17:35:17 -0000
@@ -29,9 +29,9 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

+#include "lt__private.h"
 #include "lt_system.h"
 #include "lt_dlloader.h"
-#include "lt__private.h"


 /* --- MANIFEST CONSTANTS --- */
Index: libltdl/loaders/dlopen.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/loaders/dlopen.c,v
retrieving revision 1.10
diff -u -r1.10 dlopen.c
--- libltdl/loaders/dlopen.c    8 May 2007 14:38:50 -0000       1.10
+++ libltdl/loaders/dlopen.c    4 Jul 2007 17:35:17 -0000
@@ -29,8 +29,8 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "lt_dlloader.h"
 #include "lt__private.h"
+#include "lt_dlloader.h"

 /* Use the preprocessor to rename non-static symbols to avoid namespace
    collisions when the loader code is statically linked into libltdl.
Index: libltdl/loaders/dyld.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/loaders/dyld.c,v
retrieving revision 1.8
diff -u -r1.8 dyld.c
--- libltdl/loaders/dyld.c      8 May 2007 14:38:50 -0000       1.8
+++ libltdl/loaders/dyld.c      4 Jul 2007 17:35:17 -0000
@@ -29,8 +29,8 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "lt_dlloader.h"
 #include "lt__private.h"
+#include "lt_dlloader.h"

 /* Use the preprocessor to rename non-static symbols to avoid namespace
    collisions when the loader code is statically linked into libltdl.
Index: libltdl/loaders/preopen.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/loaders/preopen.c,v
retrieving revision 1.14
diff -u -r1.14 preopen.c
--- libltdl/loaders/preopen.c   24 Jun 2007 20:46:46 -0000      1.14
+++ libltdl/loaders/preopen.c   4 Jul 2007 17:35:17 -0000
@@ -29,8 +29,8 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include "lt_dlloader.h"
 #include "lt__private.h"
+#include "lt_dlloader.h"

 /* Use the preprocessor to rename non-static symbols to avoid namespace
    collisions when the loader code is statically linked into libltdl.