From: Gary V. Vaughan Date: Wed, 1 Sep 2004 08:51:35 +0000 (+0000) Subject: * libltdl/ltdl.c (try_dlopen, lt_dlforeachfile): Use correct cpp X-Git-Tag: release-1-9d~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23b9ddd8a364f4ecf4bd9194b6e881eea992c987;p=thirdparty%2Flibtool.git * libltdl/ltdl.c (try_dlopen, lt_dlforeachfile): Use correct cpp macro name, LT_DLSEARCH_PATH. --- diff --git a/ChangeLog b/ChangeLog index 4a78dd4eb..717cc2364 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-09-01 Gary V. Vaughan + * libltdl/ltdl.c (try_dlopen, lt_dlforeachfile): Use correct cpp + macro name, LT_DLSEARCH_PATH. + * libltdl/ltdl.c (lt_dlexit, tryall_dlopen): Fix gcc parentheses warning. (foreach_dirinpath, try_dlopen, lt_dlpath_insertdir): Fix gcc diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 44aab477f..9c4215b10 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c @@ -1063,7 +1063,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename) file = find_file (search_path, base_name, &dir); } #endif -#if defined(LT_SYS_DLSEARCH_PATH) +#if defined(LT_DLSEARCH_PATH) if (!file && sys_dlsearch_path) { file = find_file (sys_dlsearch_path, base_name, &dir); @@ -1260,7 +1260,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename) && !find_handle (getenv (LT_MODULE_PATH_VAR), base_name, &newhandle) #endif -#if defined(LT_SYS_DLSEARCH_PATH) +#if defined(LT_DLSEARCH_PATH) && !find_handle (sys_dlsearch_path, base_name, &newhandle) #endif ))) @@ -1627,7 +1627,7 @@ lt_dlforeachfile (const char *search_path, foreachfile_callback, func, data); } #endif -#if defined(LT_SYS_DLSEARCH_PATH) +#if defined(LT_DLSEARCH_PATH) if (!is_done && sys_dlsearch_path) { is_done = foreach_dirinpath (sys_dlsearch_path, 0,