From e528b69885f4dca1f7794145b65fdbd36ccc09fd Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 22 Dec 2004 21:55:56 +0000 Subject: Cleanup for when LDSO_CACHE_SUPPORT is disabled --- ldso/include/dl-defs.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ldso/include') diff --git a/ldso/include/dl-defs.h b/ldso/include/dl-defs.h index 38f8762be..37588b86c 100644 --- a/ldso/include/dl-defs.h +++ b/ldso/include/dl-defs.h @@ -9,7 +9,7 @@ #define LIB_ELF_LIBC6 3 #define LIB_ELF_LIBC0 4 -/* should we include features.h? */ +#if defined(__LDSO_PRELOAD_FILE_SUPPORT__) || defined(__LDSO_CACHE_SUPPORT__) #ifndef __LDSO_BASE_FILENAME__ #define __LDSO_BASE_FILENAME__ "ld.so" #endif @@ -19,11 +19,10 @@ #define LDSO_PRELOAD LDSO_BASE_PATH ".preload" #endif -/* NB: ldconfig still uses these values */ +#ifdef __LDSO_CACHE_SUPPORT__ #define LDSO_CONF LDSO_BASE_PATH ".conf" #define LDSO_CACHE LDSO_BASE_PATH ".cache" -#ifdef __LDSO_CACHE_SUPPORT__ #define LDSO_CACHE_MAGIC "ld.so-" #define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1) #define LDSO_CACHE_VER "1.7.0" @@ -42,4 +41,6 @@ typedef struct { } libentry_t; #endif /* __LDSO_CACHE_SUPPORT__ */ +#endif + #endif /* _LD_DEFS_H */ -- cgit v1.2.3