From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 29 Nov 2000 22:59:56 +0000 (+0000)
Subject: * libltdl/ltdl.h (lt_dlhandle): Rename the wrapped structure
X-Git-Tag: release-1-3d~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2cc89dcb2763caebafe7901915fdf44113b477a;p=thirdparty%2Flibtool.git

* libltdl/ltdl.h (lt_dlhandle): Rename the wrapped structure
to prevent nameclash when used from C++.
* libltdl/ltdl.c: Fixed all references.
---

diff --git a/ChangeLog b/ChangeLog
index 069a75a3d..4aa86da32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-29  Gary V. Vaughan  <gvv@techie.com>
+
+	* libltdl/ltdl.h (lt_dlhandle): Rename the wrapped structure
+	to prevent nameclash when used from C++.
+	* libltdl/ltdl.c: Fixed all references.
+
 2000-11-25  Gary V. Vaughan  <gvv@techie.com>
 
 	* libltdl/ltdl.c (lt_dlopen):  Change the default search order
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 7b36f429c..97db20059 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -114,8 +114,8 @@ struct lt_dlloader {
   lt_user_data		dlloader_data;
 };
 
-struct lt_dlhandle {
-  struct lt_dlhandle   *next;
+struct lt_dlhandle_struct {
+  struct lt_dlhandle_struct   *next;
   lt_dlloader	       *loader;		/* dlopening interface */
   lt_dlinfo		info;
   int			depcount;	/* number of dependencies */
@@ -1700,7 +1700,7 @@ lt_dlopen (filename)
   /* dlopen self? */
   if (!filename)
     {
-      handle = (lt_dlhandle) lt_dlmalloc (sizeof (struct lt_dlhandle));
+      handle = (lt_dlhandle) lt_dlmalloc (sizeof (struct lt_dlhandle_struct));
       if (!handle)
 	{
 	  last_error = LT_DLSTRERROR (NO_MEMORY);
@@ -1758,7 +1758,7 @@ lt_dlopen (filename)
   if (ext && strcmp(ext, ".la") == 0)
     {
       /* this seems to be a libtool module */
-      FILE     *file;
+      FILE     *file = 0;
       int	i;
       char     *dlname = 0, *old_name = 0;
       char     *libdir = 0, *deplibs = 0;
@@ -1921,7 +1921,7 @@ lt_dlopen (filename)
     lt_dlfree (line);
 
     /* allocate the handle */
-    handle = (lt_dlhandle) lt_dlmalloc (sizeof (struct lt_dlhandle));
+    handle = (lt_dlhandle) lt_dlmalloc (sizeof (struct lt_dlhandle_struct));
     if (!handle || error)
       {
 	if (handle)
@@ -1970,7 +1970,7 @@ lt_dlopen (filename)
   else
     {
       /* not a libtool module */
-      handle = (lt_dlhandle) lt_dlmalloc (sizeof (struct lt_dlhandle));
+      handle = (lt_dlhandle) lt_dlmalloc (sizeof (struct lt_dlhandle_struct));
       if (!handle)
 	{
 	  last_error = LT_DLSTRERROR (NO_MEMORY);
diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index bda28aa5f..1ae64bb45 100644
--- a/libltdl/ltdl.h
+++ b/libltdl/ltdl.h
@@ -140,7 +140,7 @@ LT_BEGIN_C_DECLS
 /* --- DYNAMIC MODULE LOADING API --- */
 
 
-typedef	struct lt_dlhandle *lt_dlhandle;	/* A loaded module.  */
+typedef	struct lt_dlhandle_struct *lt_dlhandle;	/* A loaded module.  */
 
 /* Initialisation and finalisation functions for libltdl. */
 extern	int	    lt_dlinit		LT_PARAMS((void));