diff options
| author | Eric Blake <ebb9@byu.net> | 2006-07-22 20:34:06 +0000 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2006-07-22 20:34:06 +0000 |
| commit | 4704053cacc0cd2cffcf3353ede0b4125273b66f (patch) | |
| tree | 4e0d1232180642da17f72b7b3a8462df50247f3c | |
| parent | dad710f89197f91a205cf05cd1997121e66452a2 (diff) | |
| download | libtool-4704053cacc0cd2cffcf3353ede0b4125273b66f.tar.gz | |
* libltdl/ltdl.c (loader_init_callback) [HAVE_LIBDLLOADER]:
Protect definition to avoid compiler warnings about unused
function.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libltdl/ltdl.c | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2006-07-22 Eric Blake <ebb9@byu.net> + + * libltdl/ltdl.c (loader_init_callback) [HAVE_LIBDLLOADER]: + Protect definition to avoid compiler warnings about unused + function. + 2006-07-21 Eric Blake <ebb9@byu.net> * libltdl/m4/ltdl.m4 (LT_LIB_DLLOAD): Search for dlopen without diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index a1731cce..15e2c5d6 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c @@ -130,12 +130,15 @@ static int list_files_by_dir (const char *dirnam, char **pargz, size_t *pargz_len); static int file_not_found (void); +#ifdef HAVE_LIBDLLOADER static int loader_init_callback (lt_dlhandle handle); +#endif /* HAVE_LIBDLLOADER */ + static int loader_init (lt_get_vtable *vtable_func, lt_user_data data); static char *user_search_path= 0; -static lt_dlhandle handles = 0; +static lt_dlhandle handles = 0; static int initialized = 0; /* Our memory failure callback sets the error message to be passed back @@ -147,6 +150,7 @@ lt__alloc_die_callback (void) LT__SETERROR (NO_MEMORY); } +#ifdef HAVE_LIBDLLOADER /* This function is called to initialise each preloaded module loader, and hook it into the list of loaders to be used when attempting to dlopen an application module. */ @@ -155,6 +159,7 @@ loader_init_callback (lt_dlhandle handle) { return loader_init (lt_dlsym (handle, "get_vtable"), 0); } +#endif /* HAVE_LIBDLLOADER */ static int loader_init (lt_get_vtable *vtable_func, lt_user_data data) |