summaryrefslogtreecommitdiff
path: root/ldso/include
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-12-22 21:55:56 +0000
committerEric Andersen <andersen@codepoet.org>2004-12-22 21:55:56 +0000
commite528b69885f4dca1f7794145b65fdbd36ccc09fd (patch)
treec95410307ca8b37e1d6e80b1d04b3c377a66a6a2 /ldso/include
parent47a9d4544eeac98adef6f703a5ec2889896a4c90 (diff)
Cleanup for when LDSO_CACHE_SUPPORT is disabled
Diffstat (limited to 'ldso/include')
-rw-r--r--ldso/include/dl-defs.h7
1 files changed, 4 insertions, 3 deletions
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 */