repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 376bc6d977112b74b39f8e2a18c0a585295c08f7:
path_to: 
revision_to: 

commit 376bc6d977112b74b39f8e2a18c0a585295c08f7
Author: Emanuele Giaquinta 
Date:   Mon Jan 23 10:26:22 2006 +0000

    *** empty log message ***

diff --git a/Changes b/Changes

--- a/Changes
+++ b/Changes
@@ -16,7 +16,6 @@ WISH: just for fun, do shade and tint with XRender.
 DUMB: support tex fonts

 TODO: kill arabic presentation form table
-TODO: kill dlmalloc dmalloc
 TODO: bug ayin to document possible configure options?

 7.2  Sun Jan 22 21:58:16 CET 2006
diff --git a/configure.ac b/configure.ac

--- a/configure.ac
+++ b/configure.ac
@@ -108,8 +108,6 @@ dnl AC_ENABLE_SHARED(no)dnl#	libtool
 dnl AC_ENABLE_STATIC(yes)dnl#	libtool
 dnl AC_PROG_LIBTOOL()dnl#		libtool

-MALLOC_TYPE=S
-
 support_frills=yes
 support_inheritpixmap=yes
 support_tinting=yes
@@ -415,25 +413,6 @@ AC_ARG_ENABLE(slipwheeling,
     support_mouseslipwheel=$enableval
   fi])

-AC_ARG_ENABLE(dmalloc,
-  [  --enable-dmalloc        enable Gray Watson's malloc - for debugging use],
-  [if test x$enableval = xyes; then
-    MALLOC_TYPE=G
-    DEBUG=-DDEBUG_MALLOC
-    DLIB="-L/usr/local/lib -ldmalloc"
-    DINCLUDE=-I/usr/local/include
-  fi])
-
-AC_ARG_ENABLE(dlmalloc,
-  [  --enable-dlmalloc       enable Doug Lea's malloc - for production use
-                     NOTE: enable only one malloc package],
-  [if test x$enableval = xyes; then
-    MALLOC_TYPE=D
-    DEBUG=
-    DLIB="-L/usr/local/lib -ldlmalloc"
-    DINCLUDE=
-  fi])
-
 AC_ARG_ENABLE(smart-resize,
   [  --enable-smart-resize   enable smart growth/shrink behaviour],
   [if test x$enableval = xyes; then
@@ -1006,16 +985,6 @@ echo "Configuration:
   Compiler flags:             $CFLAGS
   Linker:                     $LINKER"

-if test "$MALLOC_TYPE" = S; then
-  echo "  malloc support:             system default"
-fi
-if test "$MALLOC_TYPE" = G; then
-  echo "  malloc support:             Gray Watson's dmalloc"
-fi
-if test "$MALLOC_TYPE" = D; then
-  echo "  malloc support:             Doug Lea's malloc"
-fi
-
 if test x$support_xpm = xyes; then
   echo "  Xpm library:                $XPM_LIBS"
 fi
diff --git a/src/rxvt.h b/src/rxvt.h

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1528,9 +1528,5 @@ struct rxvt_term : zero_initialized, rxvt_vars {
 # define __PROTO(p)     ()
 #endif

-#ifdef DEBUG_malloc
-# include "dmalloc.h"           /* This comes last */
-#endif
-
 #endif                          /* _RXVT_H_ */

-----END OF PAGE-----