1 files changed, 113 insertions, 113 deletions

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 8ad947dc..b72cf723 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 #if HAVE_STDLIB_H
 #  include <stdlib.h>
 #else
-#  if HAVE_MALLOC_H
+#  if HAVE_GNUNET_malloc_H
 #    include <malloc.h>
 #  endif
 #endif
@@ -128,7 +128,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 
 #include "ltdl.h"
 
-#if WITH_DMALLOC
+#if WITH_DGNUNET_malloc
 #  include <dmalloc.h>
 #endif
 
@@ -228,24 +228,24 @@ LT_PARAMS ((size_t size)) = (lt_ptr (*)LT_PARAMS ((size_t))) malloc;
 
 /* The following macros reduce the amount of typing needed to cast
    assigned memory.  */
-#if WITH_DMALLOC
+#if WITH_DGNUNET_malloc
 
-#define LT_DLMALLOC(tp, n)      ((tp *) xmalloc ((n) * sizeof(tp)))
+#define LT_DLGNUNET_malloc(tp, n)       ((tp *) xmalloc ((n) * sizeof(tp)))
 #define LT_DLREALLOC(tp, p, n)  ((tp *) xrealloc ((p), (n) * sizeof(tp)))
-#define LT_DLFREE(p)                                            \
+#define LT_DLGNUNET_free(p)                                             \
         LT_STMT_START { if (p) (p) = (xfree (p), (lt_ptr) 0); } LT_STMT_END
 
-#define LT_EMALLOC(tp, n)       ((tp *) xmalloc ((n) * sizeof(tp)))
+#define LT_EGNUNET_malloc(tp, n)        ((tp *) xmalloc ((n) * sizeof(tp)))
 #define LT_EREALLOC(tp, p, n)   ((tp *) xrealloc ((p), (n) * sizeof(tp)))
 
 #else
 
-#define LT_DLMALLOC(tp, n)      ((tp *) lt_dlmalloc ((n) * sizeof(tp)))
+#define LT_DLGNUNET_malloc(tp, n)       ((tp *) lt_dlmalloc ((n) * sizeof(tp)))
 #define LT_DLREALLOC(tp, p, n)  ((tp *) lt_dlrealloc ((p), (n) * sizeof(tp)))
-#define LT_DLFREE(p)                                            \
+#define LT_DLGNUNET_free(p)                                             \
         LT_STMT_START { if (p) (p) = (lt_dlfree (p), (lt_ptr) 0); } LT_STMT_END
 
-#define LT_EMALLOC(tp, n)       ((tp *) lt_emalloc ((n) * sizeof(tp)))
+#define LT_EGNUNET_malloc(tp, n)        ((tp *) lt_emalloc ((n) * sizeof(tp)))
 #define LT_EREALLOC(tp, p, n)   ((tp *) lt_erealloc ((p), (n) * sizeof(tp)))
 
 #endif
@@ -270,7 +270,7 @@ LT_PARAMS ((size_t size)) = (lt_ptr (*)LT_PARAMS ((size_t))) malloc;
 
   if (str)
     {
-      tmp = LT_DLMALLOC (char, 1 + strlen (str));
+      tmp = LT_DLGNUNET_malloc (char, 1 + strlen (str));
       if (tmp)
         {
           strcpy (tmp, str);
@@ -455,7 +455,7 @@ opendir (path)
   assert (path != (char *) NULL);
   (void) strncpy (file_specification, path, LT_FILENAME_MAX - 1);
   (void) strcat (file_specification, "\\");
-  entry = LT_DLMALLOC (DIR, sizeof (DIR));
+  entry = LT_DLGNUNET_malloc (DIR, sizeof (DIR));
   if (entry != (DIR *) 0)
     {
       entry->firsttime = TRUE;
@@ -469,7 +469,7 @@ opendir (path)
         FindFirstFile (file_specification, &entry->Win32FindData);
       if (entry->hSearch == INVALID_HANDLE_VALUE)
         {
-          LT_DLFREE (entry);
+          LT_DLGNUNET_free (entry);
           return (DIR *) 0;
         }
     }
@@ -628,7 +628,7 @@ argz_create_sep (str, delim, pargz, pargz_len)
       const char *p;
       char *q;
 
-      argz = LT_DLMALLOC (char, argz_len);
+      argz = LT_DLGNUNET_malloc (char, argz_len);
       if (!argz)
         return ENOMEM;
 
@@ -652,7 +652,7 @@ argz_create_sep (str, delim, pargz, pargz_len)
 
   /* If ARGZ_LEN has shrunk to nothing, release ARGZ's memory.  */
   if (!argz_len)
-    LT_DLFREE (argz);
+    LT_DLGNUNET_free (argz);
 
   /* Assign new values.  */
   *pargz = argz;
@@ -870,7 +870,7 @@ static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
 
 
 
-/* --- MUTEX LOCKING --- */
+/* --- GNUNET_Mutex LOCKING --- */
 
 
 /* Macros to make it easier to run the lock functions only if they have
@@ -878,7 +878,7 @@ static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
    ensure that the stored error message from the last error is not
    accidentally erased if the current function doesn't generate an
    error of its own.  */
-#define LT_DLMUTEX_LOCK()                       LT_STMT_START { \
+#define LT_DLGNUNET_mutex_lock()                        LT_STMT_START { \
         if (lt_dlmutex_lock_func) (*lt_dlmutex_lock_func)();    \
                                                 } LT_STMT_END
 #define LT_DLMUTEX_UNLOCK()                     LT_STMT_START { \
@@ -917,7 +917,7 @@ lt_dlmutex_register (lock, unlock, seterror, geterror)
   int errors = 0;
 
   /* Lock using the old lock() callback, if any.  */
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   if ((lock && unlock && seterror && geterror)
       || !(lock || unlock || seterror || geterror))
@@ -961,7 +961,7 @@ lt_dladderror (diagnostic)
 
   assert (diagnostic);
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   errindex = errorcount - LT_ERROR_MAX;
   temp = LT_EREALLOC (const char *, user_error_strings, 1 + errindex);
@@ -983,7 +983,7 @@ lt_dlseterror (errindex)
 {
   int errors = 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   if (errindex >= errorcount || errindex < 0)
     {
@@ -1326,7 +1326,7 @@ sys_wll_open (loader_data, filename)
     {
       /* Append a `.' to stop Windows from adding an
          implicit `.dll' extension. */
-      searchname = LT_EMALLOC (char, 2 + LT_STRLEN (filename));
+      searchname = LT_EGNUNET_malloc (char, 2 + LT_STRLEN (filename));
       if (searchname)
         sprintf (searchname, "%s.", filename);
     }
@@ -1342,7 +1342,7 @@ sys_wll_open (loader_data, filename)
 #else
   module = LoadLibrary (searchname);
 #endif
-  LT_DLFREE (searchname);
+  LT_DLGNUNET_free (searchname);
 
   /* libltdl expects this function to fail if it is unable
      to physically load the library.  Sadly, LoadLibrary
@@ -1352,7 +1352,7 @@ sys_wll_open (loader_data, filename)
      We check whether LoadLibrary is returning a handle to
      an already loaded module, and simulate failure if we
      find one. */
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   cur = handles;
   while (cur)
     {
@@ -1522,7 +1522,7 @@ sys_dld_open (loader_data, filename)
   if (dld_link (filename) != 0)
     {
       LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-      LT_DLFREE (module);
+      LT_DLGNUNET_free (module);
       module = 0;
     }
 
@@ -1543,7 +1543,7 @@ sys_dld_close (loader_data, module)
     }
   else
     {
-      LT_DLFREE (module);
+      LT_DLGNUNET_free (module);
     }
 
   return errors;
@@ -1982,7 +1982,7 @@ presym_init (loader_data)
 {
   int errors = 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   preloaded_symbols = 0;
   if (default_preloaded_symbols)
@@ -2000,7 +2000,7 @@ presym_free_symlists ()
 {
   lt_dlsymlists_t *lists;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   lists = preloaded_symbols;
   while (lists)
@@ -2008,7 +2008,7 @@ presym_free_symlists ()
       lt_dlsymlists_t *tmp = lists;
 
       lists = lists->next;
-      LT_DLFREE (tmp);
+      LT_DLGNUNET_free (tmp);
     }
   preloaded_symbols = 0;
 
@@ -2033,7 +2033,7 @@ presym_add_symlist (preloaded)
   lt_dlsymlists_t *lists;
   int errors = 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   lists = preloaded_symbols;
   while (lists)
@@ -2045,7 +2045,7 @@ presym_add_symlist (preloaded)
       lists = lists->next;
     }
 
-  tmp = LT_EMALLOC (lt_dlsymlists_t, 1);
+  tmp = LT_EGNUNET_malloc (lt_dlsymlists_t, 1);
   if (tmp)
     {
       memset (tmp, 0, sizeof (lt_dlsymlists_t));
@@ -2071,7 +2071,7 @@ presym_open (loader_data, filename)
   lt_dlsymlists_t *lists;
   lt_module module = (lt_module) 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   lists = preloaded_symbols;
 
   if (!lists)
@@ -2225,7 +2225,7 @@ lt_dlinit ()
 {
   int errors = 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   /* Initialize only at first call. */
   if (++initialized == 1)
@@ -2285,7 +2285,7 @@ lt_dlpreload (preloaded)
     {
       presym_free_symlists ();
 
-      LT_DLMUTEX_LOCK ();
+      LT_DLGNUNET_mutex_lock ();
       if (default_preloaded_symbols)
         {
           errors = lt_dlpreload (default_preloaded_symbols);
@@ -2300,7 +2300,7 @@ int
 lt_dlpreload_default (preloaded)
      const lt_dlsymlist *preloaded;
 {
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   default_preloaded_symbols = preloaded;
   LT_DLMUTEX_UNLOCK ();
   return 0;
@@ -2313,7 +2313,7 @@ lt_dlexit ()
   lt_dlloader *loader;
   int errors = 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   loader = loaders;
 
   if (!initialized)
@@ -2389,7 +2389,7 @@ tryall_dlopen (handle, filename)
   int errors = 0;
 
   LT_DLMUTEX_GETERROR (saved_error);
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   cur = handles;
   loader = loaders;
@@ -2461,7 +2461,7 @@ tryall_dlopen (handle, filename)
 
   if (!loader)
     {
-      LT_DLFREE (cur->info.filename);
+      LT_DLGNUNET_free (cur->info.filename);
       ++errors;
       goto done;
     }
@@ -2503,7 +2503,7 @@ tryall_dlopen_module (handle, prefix, dirname, dlname)
 
   /* Allocate memory, and combine DIRNAME and MODULENAME into it.
      The PREFIX (if any) is handled below.  */
-  filename = LT_EMALLOC (char, dirname_len + 1 + filename_len + 1);
+  filename = LT_EGNUNET_malloc (char, dirname_len + 1 + filename_len + 1);
   if (!filename)
     return 1;
 
@@ -2522,7 +2522,7 @@ tryall_dlopen_module (handle, prefix, dirname, dlname)
       ++error;
     }
 
-  LT_DLFREE (filename);
+  LT_DLGNUNET_free (filename);
   return error;
 }
 
@@ -2582,7 +2582,7 @@ canonicalize_path (path, pcanonical)
   assert (path && *path);
   assert (pcanonical);
 
-  canonical = LT_EMALLOC (char, 1 + LT_STRLEN (path));
+  canonical = LT_EGNUNET_malloc (char, 1 + LT_STRLEN (path));
   if (!canonical)
     return 1;
 
@@ -2685,7 +2685,7 @@ foreach_dirinpath (search_path, base_name, func, data1, data2)
   char *filename = 0;
   char *canonical = 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   if (!search_path || !*search_path)
     {
@@ -2707,9 +2707,9 @@ foreach_dirinpath (search_path, base_name, func, data1, data2)
 
         if (lendir + 1 + lenbase >= filenamesize)
           {
-            LT_DLFREE (filename);
+            LT_DLGNUNET_free (filename);
             filenamesize = lendir + 1 + lenbase + 1;    /* "/d" + '/' + "f" + '\0' */
-            filename = LT_EMALLOC (char, filenamesize);
+            filename = LT_EGNUNET_malloc (char, filenamesize);
             if (!filename)
               goto cleanup;
           }
@@ -2732,9 +2732,9 @@ foreach_dirinpath (search_path, base_name, func, data1, data2)
   }
 
 cleanup:
-  LT_DLFREE (argz);
-  LT_DLFREE (canonical);
-  LT_DLFREE (filename);
+  LT_DLGNUNET_free (argz);
+  LT_DLGNUNET_free (canonical);
+  LT_DLGNUNET_free (filename);
 
   LT_DLMUTEX_UNLOCK ();
 
@@ -2765,7 +2765,7 @@ find_file_callback (filename, data1, data2)
       if (dirend > filename)
         *dirend = LT_EOS_CHAR;
 
-      LT_DLFREE (*pdir);
+      LT_DLGNUNET_free (*pdir);
       *pdir = lt_estrdup (filename);
       is_done = (*pdir == 0) ? -1 : 1;
     }
@@ -2847,7 +2847,7 @@ load_deplibs (handle, deplibs)
     }
   ++errors;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   if (user_search_path)
     {
       save_search_path = lt_estrdup (user_search_path);
@@ -2891,7 +2891,7 @@ load_deplibs (handle, deplibs)
     }
 
   /* restore the old search path */
-  LT_DLFREE (user_search_path);
+  LT_DLGNUNET_free (user_search_path);
   user_search_path = save_search_path;
 
   LT_DLMUTEX_UNLOCK ();
@@ -2902,7 +2902,7 @@ load_deplibs (handle, deplibs)
       goto cleanup;
     }
 
-  names = LT_EMALLOC (char *, depcount * sizeof (char *));
+  names = LT_EGNUNET_malloc (char *, depcount * sizeof (char *));
   if (!names)
     goto cleanup;
 
@@ -2931,7 +2931,7 @@ load_deplibs (handle, deplibs)
               if (strncmp (p, "-l", 2) == 0)
                 {
                   size_t name_len = 3 + /* "lib" */ LT_STRLEN (p + 2);
-                  name = LT_EMALLOC (char, 1 + name_len);
+                  name = LT_EGNUNET_malloc (char, 1 + name_len);
                   if (name)
                     sprintf (name, "lib%s", p + 2);
                 }
@@ -2957,7 +2957,7 @@ load_deplibs (handle, deplibs)
     {
       int j = 0;
 
-      handle->deplibs = (lt_dlhandle *) LT_EMALLOC (lt_dlhandle *, depcount);
+      handle->deplibs = (lt_dlhandle *) LT_EGNUNET_malloc (lt_dlhandle *, depcount);
       if (!handle->deplibs)
         goto cleanup;
 
@@ -2977,11 +2977,11 @@ load_deplibs (handle, deplibs)
 cleanup_names:
   for (i = 0; i < depcount; ++i)
     {
-      LT_DLFREE (names[i]);
+      LT_DLGNUNET_free (names[i]);
     }
 
 cleanup:
-  LT_DLFREE (names);
+  LT_DLGNUNET_free (names);
 #endif
 
   return errors;
@@ -3019,11 +3019,11 @@ trim (dest, str)
   size_t len = LT_STRLEN (str);
   char *tmp;
 
-  LT_DLFREE (*dest);
+  LT_DLGNUNET_free (*dest);
 
   if (len > 3 && str[0] == '\'')
     {
-      tmp = LT_EMALLOC (char, end - str);
+      tmp = LT_EGNUNET_malloc (char, end - str);
       if (!tmp)
         return 1;
 
@@ -3046,10 +3046,10 @@ free_vars (dlname, oldname, libdir, deplibs)
      char *libdir;
      char *deplibs;
 {
-  LT_DLFREE (dlname);
-  LT_DLFREE (oldname);
-  LT_DLFREE (libdir);
-  LT_DLFREE (deplibs);
+  LT_DLGNUNET_free (dlname);
+  LT_DLGNUNET_free (oldname);
+  LT_DLGNUNET_free (libdir);
+  LT_DLGNUNET_free (deplibs);
 
   return 0;
 }
@@ -3076,7 +3076,7 @@ try_dlopen (phandle, filename)
   /* dlopen self? */
   if (!filename)
     {
-      *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
+      *phandle = (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
         return 1;
 
@@ -3088,7 +3088,7 @@ try_dlopen (phandle, filename)
 
       if (tryall_dlopen (&newhandle, 0) != 0)
         {
-          LT_DLFREE (*phandle);
+          LT_DLGNUNET_free (*phandle);
           return 1;
         }
 
@@ -3112,7 +3112,7 @@ try_dlopen (phandle, filename)
     {
       size_t dirlen = (1 + base_name) - canonical;
 
-      dir = LT_EMALLOC (char, 1 + dirlen);
+      dir = LT_EGNUNET_malloc (char, 1 + dirlen);
       if (!dir)
         {
           ++errors;
@@ -3148,7 +3148,7 @@ try_dlopen (phandle, filename)
       int installed = 1;
 
       /* extract the module name from the file name */
-      name = LT_EMALLOC (char, ext - base_name + 1);
+      name = LT_EGNUNET_malloc (char, ext - base_name + 1);
       if (!name)
         {
           ++errors;
@@ -3180,7 +3180,7 @@ try_dlopen (phandle, filename)
         {
           const char *search_path;
 
-          LT_DLMUTEX_LOCK ();
+          LT_DLGNUNET_mutex_lock ();
           search_path = user_search_path;
           if (search_path)
             file = find_file (user_search_path, base_name, &dir);
@@ -3223,7 +3223,7 @@ try_dlopen (phandle, filename)
         }
 
       line_len = LT_FILENAME_MAX;
-      line = LT_EMALLOC (char, line_len);
+      line = LT_EGNUNET_malloc (char, line_len);
       if (!line)
         {
           fclose (file);
@@ -3318,17 +3318,17 @@ try_dlopen (phandle, filename)
         }
 
       fclose (file);
-      LT_DLFREE (line);
+      LT_DLGNUNET_free (line);
 
       /* allocate the handle */
-      *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
+      *phandle = (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
         ++errors;
 
       if (errors)
         {
           free_vars (dlname, old_name, libdir, deplibs);
-          LT_DLFREE (*phandle);
+          LT_DLGNUNET_free (*phandle);
           goto cleanup;
         }
 
@@ -3354,7 +3354,7 @@ try_dlopen (phandle, filename)
       free_vars (dlname, old_name, libdir, deplibs);
       if (errors)
         {
-          LT_DLFREE (*phandle);
+          LT_DLGNUNET_free (*phandle);
           goto cleanup;
         }
 
@@ -3366,7 +3366,7 @@ try_dlopen (phandle, filename)
   else
     {
       /* not a libtool module */
-      *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
+      *phandle = (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
         {
           ++errors;
@@ -3400,7 +3400,7 @@ try_dlopen (phandle, filename)
 
       if (!newhandle)
         {
-          LT_DLFREE (*phandle);
+          LT_DLGNUNET_free (*phandle);
           ++errors;
           goto cleanup;
         }
@@ -3414,7 +3414,7 @@ register_handle:
       (*phandle)->info.ref_count = 1;
       LT_DLMEM_REASSIGN ((*phandle)->info.name, name);
 
-      LT_DLMUTEX_LOCK ();
+      LT_DLGNUNET_mutex_lock ();
       (*phandle)->next = handles;
       handles = *phandle;
       LT_DLMUTEX_UNLOCK ();
@@ -3423,9 +3423,9 @@ register_handle:
   LT_DLMUTEX_SETERROR (saved_error);
 
 cleanup:
-  LT_DLFREE (dir);
-  LT_DLFREE (name);
-  LT_DLFREE (canonical);
+  LT_DLGNUNET_free (dir);
+  LT_DLGNUNET_free (name);
+  LT_DLGNUNET_free (canonical);
 
   return errors;
 }
@@ -3494,7 +3494,7 @@ lt_dlopenext (filename)
     }
 
   /* First try appending ARCHIVE_EXT.  */
-  tmp = LT_EMALLOC (char, len + LT_STRLEN (archive_ext) + 1);
+  tmp = LT_EGNUNET_malloc (char, len + LT_STRLEN (archive_ext) + 1);
   if (!tmp)
     return 0;
 
@@ -3509,7 +3509,7 @@ lt_dlopenext (filename)
      in the module search path.  */
   if (handle || ((errors > 0) && !file_not_found ()))
     {
-      LT_DLFREE (tmp);
+      LT_DLGNUNET_free (tmp);
       return handle;
     }
 
@@ -3517,8 +3517,8 @@ lt_dlopenext (filename)
   /* Try appending SHLIB_EXT.   */
   if (LT_STRLEN (shlib_ext) > LT_STRLEN (archive_ext))
     {
-      LT_DLFREE (tmp);
-      tmp = LT_EMALLOC (char, len + LT_STRLEN (shlib_ext) + 1);
+      LT_DLGNUNET_free (tmp);
+      tmp = LT_EGNUNET_malloc (char, len + LT_STRLEN (shlib_ext) + 1);
       if (!tmp)
         return 0;
 
@@ -3536,7 +3536,7 @@ lt_dlopenext (filename)
      with the current error message.  */
   if (handle || ((errors > 0) && !file_not_found ()))
     {
-      LT_DLFREE (tmp);
+      LT_DLGNUNET_free (tmp);
       return handle;
     }
 #endif
@@ -3544,7 +3544,7 @@ lt_dlopenext (filename)
   /* Still here?  Then we really did fail to locate any of the file
      names we tried.  */
   LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-  LT_DLFREE (tmp);
+  LT_DLGNUNET_free (tmp);
   return 0;
 }
 
@@ -3647,7 +3647,7 @@ lt_argz_insertdir (pargz, pargz_len, dirnam, dp)
   /* Prepend the directory name.  */
   end_offset = end - dp->d_name;
   buf_len = dir_len + 1 + end_offset;
-  buf = LT_EMALLOC (char, 1 + buf_len);
+  buf = LT_EGNUNET_malloc (char, 1 + buf_len);
   if (!buf)
     return ++errors;
 
@@ -3662,7 +3662,7 @@ lt_argz_insertdir (pargz, pargz_len, dirnam, dp)
   if (lt_argz_insertinorder (pargz, pargz_len, buf) != 0)
     ++errors;
 
-  LT_DLFREE (buf);
+  LT_DLGNUNET_free (buf);
 
   return errors;
 }
@@ -3731,7 +3731,7 @@ foreachfile_callback (dirname, data1, data2)
   }
 
 cleanup:
-  LT_DLFREE (argz);
+  LT_DLGNUNET_free (argz);
 
   return is_done;
 }
@@ -3795,7 +3795,7 @@ lt_dlclose (handle)
   lt_dlhandle cur, last;
   int errors = 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   /* check whether the handle is valid */
   last = cur = handles;
@@ -3835,11 +3835,11 @@ lt_dlclose (handle)
       errors += unload_deplibs (handle);
 
       /* It is up to the callers to free the data itself.  */
-      LT_DLFREE (handle->caller_data);
+      LT_DLGNUNET_free (handle->caller_data);
 
-      LT_DLFREE (handle->info.filename);
-      LT_DLFREE (handle->info.name);
-      LT_DLFREE (handle);
+      LT_DLGNUNET_free (handle->info.filename);
+      LT_DLGNUNET_free (handle->info.name);
+      LT_DLGNUNET_free (handle);
 
       goto done;
     }
@@ -3888,7 +3888,7 @@ lt_dlsym (handle, symbol)
     }
   else
     {
-      sym = LT_EMALLOC (char, lensym + LT_SYMBOL_OVERHEAD + 1);
+      sym = LT_EGNUNET_malloc (char, lensym + LT_SYMBOL_OVERHEAD + 1);
       if (!sym)
         {
           LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW));
@@ -3923,7 +3923,7 @@ lt_dlsym (handle, symbol)
         {
           if (sym != lsym)
             {
-              LT_DLFREE (sym);
+              LT_DLGNUNET_free (sym);
             }
           return address;
         }
@@ -3944,7 +3944,7 @@ lt_dlsym (handle, symbol)
   address = handle->loader->find_sym (data, handle->module, sym);
   if (sym != lsym)
     {
-      LT_DLFREE (sym);
+      LT_DLGNUNET_free (sym);
     }
 
   return address;
@@ -4027,8 +4027,8 @@ lt_dlpath_insertdir (ppath, before, dir)
   LT_DLMEM_REASSIGN (*ppath, argz);
 
 cleanup:
-  LT_DLFREE (canonical);
-  LT_DLFREE (argz);
+  LT_DLGNUNET_free (canonical);
+  LT_DLGNUNET_free (argz);
 
   return errors;
 }
@@ -4041,7 +4041,7 @@ lt_dladdsearchdir (search_dir)
 
   if (search_dir && *search_dir)
     {
-      LT_DLMUTEX_LOCK ();
+      LT_DLGNUNET_mutex_lock ();
       if (lt_dlpath_insertdir (&user_search_path, 0, search_dir) != 0)
         ++errors;
       LT_DLMUTEX_UNLOCK ();
@@ -4059,7 +4059,7 @@ lt_dlinsertsearchdir (before, search_dir)
 
   if (before)
     {
-      LT_DLMUTEX_LOCK ();
+      LT_DLGNUNET_mutex_lock ();
       if ((before < user_search_path)
           || (before >= user_search_path + LT_STRLEN (user_search_path)))
         {
@@ -4072,7 +4072,7 @@ lt_dlinsertsearchdir (before, search_dir)
 
   if (search_dir && *search_dir)
     {
-      LT_DLMUTEX_LOCK ();
+      LT_DLGNUNET_mutex_lock ();
       if (lt_dlpath_insertdir (&user_search_path,
                                (char *) before, search_dir) != 0)
         {
@@ -4090,8 +4090,8 @@ lt_dlsetsearchpath (search_path)
 {
   int errors = 0;
 
-  LT_DLMUTEX_LOCK ();
-  LT_DLFREE (user_search_path);
+  LT_DLGNUNET_mutex_lock ();
+  LT_DLGNUNET_free (user_search_path);
   LT_DLMUTEX_UNLOCK ();
 
   if (!search_path || !LT_STRLEN (search_path))
@@ -4099,7 +4099,7 @@ lt_dlsetsearchpath (search_path)
       return errors;
     }
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   if (canonicalize_path (search_path, &user_search_path) != 0)
     ++errors;
   LT_DLMUTEX_UNLOCK ();
@@ -4112,7 +4112,7 @@ lt_dlgetsearchpath ()
 {
   const char *saved_path;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   saved_path = user_search_path;
   LT_DLMUTEX_UNLOCK ();
 
@@ -4184,7 +4184,7 @@ lt_dlforeach (func, data)
   int errors = 0;
   lt_dlhandle cur;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   cur = handles;
   while (cur)
@@ -4210,7 +4210,7 @@ lt_dlcaller_register ()
   static lt_dlcaller_id last_caller_id = 0;
   int result;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   result = ++last_caller_id;
   LT_DLMUTEX_UNLOCK ();
 
@@ -4229,7 +4229,7 @@ lt_dlcaller_set_data (key, handle, data)
 
   /* This needs to be locked so that the caller data can be updated
      simultaneously by different threads.  */
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   if (handle->caller_data)
     while (handle->caller_data[n_elements].key)
@@ -4281,7 +4281,7 @@ lt_dlcaller_get_data (key, handle)
 
   /* This needs to be locked so that the caller data isn't updated by
      another thread part way through this function.  */
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   /* Locate the index of the element with a matching KEY.  */
   {
@@ -4324,7 +4324,7 @@ lt_dlloader_add (place, dlloader, loader_name)
     }
 
   /* Create a new dlloader node with copies of the user callbacks.  */
-  node = LT_EMALLOC (lt_dlloader, 1);
+  node = LT_EGNUNET_malloc (lt_dlloader, 1);
   if (!node)
     return 1;
 
@@ -4337,7 +4337,7 @@ lt_dlloader_add (place, dlloader, loader_name)
   node->find_sym = dlloader->find_sym;
   node->dlloader_data = dlloader->dlloader_data;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   if (!loaders)
     {
       /* If there are no loaders, NODE becomes the list! */
@@ -4400,7 +4400,7 @@ lt_dlloader_remove (loader_name)
       return 1;
     }
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
 
   /* Fail if there are any open modules which use this loader. */
   for (handle = handles; handle; handle = handle->next)
@@ -4439,7 +4439,7 @@ lt_dlloader_remove (loader_name)
       errors = place->dlloader_exit (place->dlloader_data);
     }
 
-  LT_DLFREE (place);
+  LT_DLGNUNET_free (place);
 
 done:
   LT_DLMUTEX_UNLOCK ();
@@ -4453,7 +4453,7 @@ lt_dlloader_next (place)
 {
   lt_dlloader *next;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   next = place ? place->next : loaders;
   LT_DLMUTEX_UNLOCK ();
 
@@ -4468,7 +4468,7 @@ lt_dlloader_name (place)
 
   if (place)
     {
-      LT_DLMUTEX_LOCK ();
+      LT_DLGNUNET_mutex_lock ();
       name = place ? place->loader_name : 0;
       LT_DLMUTEX_UNLOCK ();
     }
@@ -4488,7 +4488,7 @@ lt_dlloader_data (place)
 
   if (place)
     {
-      LT_DLMUTEX_LOCK ();
+      LT_DLGNUNET_mutex_lock ();
       data = place ? &(place->dlloader_data) : 0;
       LT_DLMUTEX_UNLOCK ();
     }
@@ -4506,7 +4506,7 @@ lt_dlloader_find (loader_name)
 {
   lt_dlloader *place = 0;
 
-  LT_DLMUTEX_LOCK ();
+  LT_DLGNUNET_mutex_lock ();
   for (place = loaders; place; place = place->next)
     {
       if (strcmp (place->loader_name, loader_name) == 0)