[uClibc-cvs] CVS uClibc/ldso/include

[CVS User andersen]

Update of /var/cvs/uClibc/ldso/include
In directory nail:/tmp/cvs-serv22589/ldso/include

Modified Files:
	dl-defs.h 
Log Message:
Cleanup for when LDSO_CACHE_SUPPORT is disabled


--- /var/cvs/uClibc/ldso/include/dl-defs.h	2004/10/12 10:48:28	1.2
+++ /var/cvs/uClibc/ldso/include/dl-defs.h	2004/12/22 21:55:56	1.3
@@ -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 @@
 } libentry_t;
 #endif	/* __LDSO_CACHE_SUPPORT__ */
 
+#endif
+
 #endif	/* _LD_DEFS_H */