Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Efence and Dmalloc support #635

Merged
merged 1 commit into from
Nov 15, 2021
Merged

Remove Efence and Dmalloc support #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,6 @@ AC_DEFINE(FVWM2RC, ".fvwm2rc")

# Various configure-time options

AC_ARG_ENABLE(dmalloc,
AS_HELP_STRING([--enable-dmalloc],
[enable support for the dmalloc debugging library]),
[ac_cv_dmalloc="$enableval"],
[ac_cv_dmalloc="no"])

AC_ARG_ENABLE(efence,
AS_HELP_STRING([--enable-efence],
[enable support for the efence debugging library]),
[ac_cv_efence="$enableval"],
[ac_cv_efence="no"])

dnl dummy: smr_SWITCH(sm, dummy for test script, on, SESSION)

# Need to know where X is, for finding some libraries (e.g. xpm)
Expand Down Expand Up @@ -1278,19 +1266,6 @@ AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF],
# define XK_Page_Down XK_Next
#endif])

# Allow building with dmalloc. Do this last to avoid screwing up any
# other checks above.
case "$ac_cv_dmalloc" in
yes) AC_CHECK_HEADERS(dmalloc.h)
AC_CHECK_LIB(dmalloc, dmalloc_shutdown)
CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK" ;;
esac


# Allow building with efence.
case "$ac_cv_efence" in
yes) AC_CHECK_LIB(efence, malloc) ;;
esac

# some explicit definitions for config.h file
AH_VERBATIM([_ZEND_EXPLICIT_DEFINITIONS],
Expand Down Expand Up @@ -1562,9 +1537,3 @@ Fvwm3 Configuration:
Build man pages? $with_mandoc$problem_mandoc

"
case "$ac_cv_dmalloc" in
yes) echo " DMALLOC heap debugging library enabled." ;;
esac
case "$ac_cv_efence" in
yes) echo " EFENCE debugging library enabled." ;;
esac
5 changes: 0 additions & 5 deletions libs/fvwmlib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
/* Convenience function ti init all the graphics subsystems */
void flib_init_graphics(Display *dpy);

/* Set up heap debugging library dmalloc. */
#ifdef HAVE_DMALLOC_H
#include <dmalloc.h>
#endif

/* Set up mtrace from glibc 2.1.x for x > ? */
#ifdef MTRACE_DEBUGGING
#include <mcheck.h>
Expand Down
7 changes: 0 additions & 7 deletions modules/FvwmIconMan/FvwmIconMan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,6 @@ main(int argc, char **argv)
{
int i;

#ifdef HAVE_LIBEFENCE
extern int EF_PROTECT_BELOW, EF_PROTECT_FREE;

EF_PROTECT_BELOW = 1;
EF_PROTECT_FREE = 1;
#endif

FlocaleInit(LC_CTYPE, "", "", "FvwmIconMan");

OpenConsole(OUTPUT_FILE);
Expand Down
4 changes: 0 additions & 4 deletions modules/FvwmIconMan/FvwmIconMan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ struct malloc_header {

#endif

#ifdef HAVE_DMALLOC_H
#include <dmalloc.h>
#endif

extern void PrintMemuse(void);

typedef unsigned long Ulong;
Expand Down