From 742931492615ea85d00f7b4f52e268a967e63efa Mon Sep 17 00:00:00 2001 From: Bob Friesenhahn Date: Wed, 4 Jul 2007 23:05:05 +0000 Subject: [PATCH] * 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. --- ChangeLog | 9 +++++++++ libltdl/loaders/dlopen.c | 2 +- libltdl/loaders/dyld.c | 2 +- libltdl/loaders/preopen.c | 2 +- libltdl/lt__alloc.c | 9 ++------- libltdl/lt__dirent.c | 3 ++- libltdl/lt_dlloader.c | 4 ++-- libltdl/lt_error.c | 4 ++-- libltdl/ltdl.c | 2 +- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 427aa98dd..4fab16879 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-07-04 Bob Friesenhahn + + * 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. + 2007-07-04 Eric Blake * libltdl/ltdl.c (advise_dup): Delete function no longer used diff --git a/libltdl/loaders/dlopen.c b/libltdl/loaders/dlopen.c index 5313bc795..1cd6b4d94 100644 --- a/libltdl/loaders/dlopen.c +++ b/libltdl/loaders/dlopen.c @@ -29,8 +29,8 @@ or obtained by writing to the Free Software Foundation, Inc., 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. diff --git a/libltdl/loaders/dyld.c b/libltdl/loaders/dyld.c index 216b42602..b6ee94365 100644 --- a/libltdl/loaders/dyld.c +++ b/libltdl/loaders/dyld.c @@ -29,8 +29,8 @@ or obtained by writing to the Free Software Foundation, Inc., 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. diff --git a/libltdl/loaders/preopen.c b/libltdl/loaders/preopen.c index 664140be4..22a81e8c4 100644 --- a/libltdl/loaders/preopen.c +++ b/libltdl/loaders/preopen.c @@ -29,8 +29,8 @@ or obtained by writing to the Free Software Foundation, Inc., 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. diff --git a/libltdl/lt__alloc.c b/libltdl/lt__alloc.c index 0850c3fc0..d39e17e73 100644 --- a/libltdl/lt__alloc.c +++ b/libltdl/lt__alloc.c @@ -1,6 +1,6 @@ /* lt__alloc.c -- internal memory management interface - Copyright (C) 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the @@ -28,16 +28,11 @@ or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if defined(LT_CONFIG_H) -# include LT_CONFIG_H -#else -# include -#endif +#include "lt__private.h" #include #include "lt__alloc.h" -#include "lt__private.h" static void alloc_die_default (void); diff --git a/libltdl/lt__dirent.c b/libltdl/lt__dirent.c index a92b059b7..30dc072c1 100644 --- a/libltdl/lt__dirent.c +++ b/libltdl/lt__dirent.c @@ -28,10 +28,11 @@ or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "lt__private.h" + #include #include -#include "lt__private.h" #include "lt__dirent.h" #if defined(__WINDOWS__) diff --git a/libltdl/lt_dlloader.c b/libltdl/lt_dlloader.c index 851bf413a..82e98cdf2 100644 --- a/libltdl/lt_dlloader.c +++ b/libltdl/lt_dlloader.c @@ -1,6 +1,6 @@ /* lt_dlloader.c -- dynamic library loader interface - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2007 Free Software Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the @@ -28,8 +28,8 @@ or obtained by writing to the Free Software Foundation, Inc., 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 diff --git a/libltdl/lt_error.c b/libltdl/lt_error.c index 64667326a..d7af36dd8 100644 --- a/libltdl/lt_error.c +++ b/libltdl/lt_error.c @@ -1,6 +1,6 @@ /* lt_error.c -- error propogation interface - Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2004, 2005, 2007 Free Software Foundation, Inc. Written by Thomas Tanner, 1999 NOTE: The canonical source of this file is maintained with the @@ -28,8 +28,8 @@ or obtained by writing to the Free Software Foundation, Inc., 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] = diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 23e606113..a3cf6e3c7 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c @@ -29,9 +29,9 @@ or obtained by writing to the Free Software Foundation, Inc., 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 --- */ -- 2.47.3