From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 10 Jan 2005 18:50:33 +0000 (+0000)
Subject: * libltdl/libltdl/lt__glibc.h: Move all exported slist
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f12d6f2201791f62f817db1cb08ed40ebd1f216;p=thirdparty%2Flibtool.git

* 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 fdd0c0063..551f0cc0b 100644
--- 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 16b3c53ef..8bb6b63d8 100644
--- 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 a1bee6f17..b8c03d2c7 100644
--- 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 4906145cb..6bb594e93 100644
--- 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