From 9f9ab4922338d58f5adf8353286039eae09e1c2f Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Wed, 6 Oct 2004 07:34:17 +0000 Subject: Puts common defines into dl-defs.h (in ldso/include) from dl-elf.h and dl-cache.h and make use of it. Also disables the lib-path-redundancy check for the case the cache is not used. Makes use of _PRELOAD_FILE_SUPPORT. From Peter Mazinger. --- utils/ldd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'utils/ldd.c') diff --git a/utils/ldd.c b/utils/ldd.c index cc50109fc..a4877e31a 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -45,7 +45,7 @@ #else #include "elf.h" #endif -#include "dl-cache.h" +#include "dl-defs.h" #ifdef DMALLOC #include @@ -439,7 +439,7 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru This list must exactly match the list in uClibc/ldso/ldso/dl-elf.c */ path = UCLIBC_RUNTIME_PREFIX "lib:" UCLIBC_RUNTIME_PREFIX "usr/lib" -#if !defined (__LDSO_CACHE_SUPPORT__) +#ifndef __LDSO_CACHE_SUPPORT__ ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib" #endif ; -- cgit v1.2.3