* libltdl/ltdl.c (lt_dlmutex_register): Fix usage of old unlock

function.  Also replace the seterror function.
* THANKS: Update.

diff --git a/ChangeLog b/ChangeLog
index abdd1ba2155942f5a30175ca362793201f698771..5c92456100e3b47d7399916d101ad9eabce9849e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-27  James Su <james.su@gmail.com>
+
+       * libltdl/ltdl.c (lt_dlmutex_register): Fix usage of old unlock
+       function.  Also replace the seterror function.
+       * THANKS: Update.
+
 2007-01-24  Reuben Thomas <rrt@sc3d.org>  (tiny change)
 
        * doc/libtool.texi (Inter-library dependencies): Fix typo.

diff --git a/THANKS b/THANKS
index 2220a17aaa76546db0512e4235f2a47f16b225e5..1049db7b0827d729c3a065f064c4142f4d648c17 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -88,6 +88,7 @@
   Howard Chu                   hyc@highlandsun.com
   Ian Lance Taylor             ian@cygnus.com
   Jacob Meuser                 jakemsr@jakemsr.com
+  James Su                     james.su@gmail.com
   Jeff Squyres                 jsquyres@lam-mpi.org
   Jeremy C. Reed               reed@reedmedia.net
   Joel N. Weber II             devnull@gnu.org

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index d3528a7f42f73ffb734bc2db73dfda80e72883dd..a13b83dec8f18286c060135479981e05176f7aa6 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -918,7 +918,7 @@ lt_dlmutex_register (lock, unlock, seterror, geterror)
      lt_dlmutex_seterror *seterror;
      lt_dlmutex_geterror *geterror;
 {
-  lt_dlmutex_unlock *old_unlock = unlock;
+  lt_dlmutex_unlock *old_unlock = lt_dlmutex_unlock_func;
   int               errors     = 0;
 
   /* Lock using the old lock() callback, if any.  */
@@ -929,6 +929,7 @@ lt_dlmutex_register (lock, unlock, seterror, geterror)
     {
       lt_dlmutex_lock_func     = lock;
       lt_dlmutex_unlock_func   = unlock;
+      lt_dlmutex_seterror_func = seterror;
       lt_dlmutex_geterror_func = geterror;
     }
   else