[PATCH] dlmalloc is unused



> > Currently Sawfish tarball includes src/dlmalloc.c file and configure
> > will check for it. But as far as I can see, it's always unused.
> > ChangeLog says:
> > 
> >         2002-02-20  John Harper  <jsh unfactored org>
> > 
> >         * configure.in: don't ever compile our own dlmalloc, it
> > breaks on too many platforms

Here's a patch to remove dlmalloc from configure. You should also
delete src/dlmalloc.c file from the repository.


diff -ur git-clean/config.h.in sawfish/config.h.in
--- git-clean/config.h.in	2009-12-29 16:32:12.000000000 +0200
+++ sawfish/config.h.in	2009-12-29 16:49:24.000000000 +0200
@@ -11,9 +11,6 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Doug Lea malloc */
-#undef DOUG_LEA_MALLOC
-
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
@@ -126,9 +123,6 @@
 /* Have xft */
 #undef HAVE_X11_XFT_XFT_H
 
-/* libc malloc */
-#undef LIBC_MALLOC
-
 /* Need pixmap cache */
 #undef NEED_PIXMAP_CACHE
 
diff -ur git-clean/configure.in sawfish/configure.in
--- git-clean/configure.in	2009-12-29 16:32:12.000000000 +0200
+++ sawfish/configure.in	2009-12-29 16:33:41.000000000 +0200
@@ -284,20 +284,6 @@
 	SUBDIRS="${SUBDIRS} po"
 fi
 
-dnl Check for Doug Lea's malloc in libc
-doug_lea_malloc=yes
-AC_CHECK_FUNC(malloc_get_state, , doug_lea_malloc=no)
-AC_CHECK_FUNC(malloc_set_state, , doug_lea_malloc=no)
-if test "$doug_lea_malloc" = "no"; then
-  dnl We used to compile our own version of dlmalloc on most
-  dnl platforms that didn't have it in their libc. But the list
-  dnl of exceptions was growing too long..
-  AC_DEFINE(LIBC_MALLOC,1,[libc malloc])
-else
-  AC_DEFINE(DOUG_LEA_MALLOC,1,[Doug Lea malloc])
-  AC_DEFINE(LIBC_MALLOC,1,[libc malloc])
-fi
-
 dnl Check for GNOME location
 AC_ARG_WITH(gnome_prefix,
  [  --with-gnome-prefix=DIR Root of GNOME installation], [],


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]