* 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 069a75a3db823e9db2204cb5ceed29a93a5f1106..4aa86da329778c668e3614be455589c3a19ae215 100644 (file)
--- 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 7b36f429c3e37cf561be2011734f49a88691246f..97db2005908a6d73e4e1b2195fc759f99655258f 100644 (file)
--- 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 bda28aa5f2b82fe043c7406cdfb2dad6358577eb..1ae64bb45a9c083563312d70a3b4e18a7edd70ca 100644 (file)
--- 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));