* libltdl/libltdl/lt__glibc.h: Move all exported slist

symbols into the lt__* namespace.
* libltdl/libltdl/lt__private.h, libltdl/libltdl/slist.h:
Adjust includes.

diff --git a/ChangeLog b/ChangeLog
index fdd0c0063e351728320abc1c1c15f5e95f3ff29b..551f0cc0b077d55d4b253bfc91c780617ddd6a18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * libltdl/libltdl/lt__glibc.h: Move all exported slist
+       symbols into the lt__* namespace.
+       * libltdl/libltdl/lt__private.h, libltdl/libltdl/slist.h:
+       Adjust includes.
+
        * tests/sh.test: After `set dummy [...]', check for `shift'
        within the same and following line.
        * config/ltmain.m4sh (func_enable_tag, func_mode_install)

diff --git a/libltdl/libltdl/lt__glibc.h b/libltdl/libltdl/lt__glibc.h
index 16b3c53efb05a5c8dae451c565c75407c41b6fa5..8bb6b63d807693a6f5a4cbad6f04efdddf776f6d 100644 (file)
--- a/libltdl/libltdl/lt__glibc.h
+++ b/libltdl/libltdl/lt__glibc.h
@@ -53,4 +53,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 
 #include <argz.h>
 
+# define slist_concat  lt__slist_concat
+# define slist_cons    lt__slist_cons
+# define slist_delete  lt__slist_delete
+# define slist_remove  lt__slist_remove
+# define slist_reverse lt__slist_reverse
+# define slist_sort    lt__slist_sort
+# define slist_tail    lt__slist_tail
+# define slist_nth     lt__slist_nth
+# define slist_find    lt__slist_find
+# define slist_length  lt__slist_length
+# define slist_foreach lt__slist_foreach
+# define slist_box     lt__slist_box
+# define slist_unbox   lt__slist_unbox
+
+#include <slist.h>
+
 #endif /*!defined(LT__GLIBC_H)*/

diff --git a/libltdl/libltdl/lt__private.h b/libltdl/libltdl/lt__private.h
index a1bee6f174f3498cf2c0012bf49b597556f78be3..b8c03d2c7672c4d1412e13b1b506a37d84619333 100644 (file)
--- a/libltdl/libltdl/lt__private.h
+++ b/libltdl/libltdl/lt__private.h
@@ -59,7 +59,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 #include "lt__dirent.h"
 #include "lt__strl.h"
 #include "lt__glibc.h"
-#include "slist.h"
 
 /* ...and all exported interfaces.  */
 #include "ltdl.h"

diff --git a/libltdl/libltdl/slist.h b/libltdl/libltdl/slist.h
index 4906145cb8c106bd0c258c8b6d4b099308bb7832..6bb594e93884c9e6f9556d4c2e50abff5c163dcf 100644 (file)
--- a/libltdl/libltdl/slist.h
+++ b/libltdl/libltdl/slist.h
@@ -41,6 +41,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 #define SLIST_H 1
 
 #if defined(LTDL)
+#  include <libltdl/lt__glibc.h>
 #  include <libltdl/lt_system.h>
 #else
 #  define LT_SCOPE