Kill Boehms GC dead.

ok mikeb@
sure deraadt@

3 files changed, 3 insertions, 33 deletions

diff --git a/usr.sbin/sasyncd/Makefile b/usr.sbin/sasyncd/Makefile
index 03253fdd5dd..8faa2990123 100644
--- a/usr.sbin/sasyncd/Makefile
+++ b/usr.sbin/sasyncd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 2012/04/14 11:46:09 haesbaert Exp $
+#	$Id: Makefile,v 1.8 2012/04/14 12:11:08 haesbaert Exp $
 
 PROG=	sasyncd
 SRCS=	sasyncd.c carp.c conf.y log.c monitor.c net.c net_ctl.c pfkey.c timer.c
@@ -25,10 +25,6 @@ CLEANFILES=	y.tab.h
 # ElectricFence
 #LDADD+=	-L/usr/local/lib -lefence
 
-# Boehms GC
-#LDADD+=	-L/usr/local/lib -lgc
-#CFLAGS+=	-DGC_DEBUG
-
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wmissing-declarations
 LDADD+=		-lcrypto -lutil
diff --git a/usr.sbin/sasyncd/sasyncd.c b/usr.sbin/sasyncd/sasyncd.c
index e90927443ff..0efefe182a9 100644
--- a/usr.sbin/sasyncd/sasyncd.c
+++ b/usr.sbin/sasyncd/sasyncd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sasyncd.c,v 1.22 2012/04/14 11:50:33 haesbaert Exp $	*/
+/*	$OpenBSD: sasyncd.c,v 1.23 2012/04/14 12:11:08 haesbaert Exp $	*/
 
 /*
  * Copyright (c) 2005 Håkan Olsson.  All rights reserved.
@@ -229,14 +229,3 @@ main(int argc, char **argv)
 	pfkey_shutdown();
 	return 0;
 }
-
-/* Special for compiling with Boehms GC. See Makefile and sasyncd.h  */
-#if defined (GC_DEBUG)
-char *
-gc_strdup(const char *x)
-{
-        char *strcpy(char *,const char *);
-        char *y = malloc(strlen(x) + 1);
-        return strcpy(y,x);
-}
-#endif
diff --git a/usr.sbin/sasyncd/sasyncd.h b/usr.sbin/sasyncd/sasyncd.h
index d518087b207..ce4be7afd48 100644
--- a/usr.sbin/sasyncd/sasyncd.h
+++ b/usr.sbin/sasyncd/sasyncd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sasyncd.h,v 1.15 2010/06/16 17:39:05 reyk Exp $	*/
+/*	$OpenBSD: sasyncd.h,v 1.16 2012/04/14 12:11:08 haesbaert Exp $	*/
 
 /*
  * Copyright (c) 2005 Håkan Olsson.  All rights reserved.
@@ -171,18 +171,3 @@ void	timer_init(void);
 void	timer_next_event(struct timeval *);
 void	timer_run(void);
 int	timer_add(char *, u_int32_t, void (*)(void *), void *);
-
-#if defined (GC_DEBUG)
-/* Boehms GC */
-void    *GC_debug_malloc(size_t, char *, int);
-void    *GC_debug_realloc(void *, size_t, char *, int);
-void     GC_debug_free(void *);
-char    *gc_strdup(const char *);
-
-#define malloc(x)       GC_debug_malloc ((x), __FILE__, __LINE__)
-#define realloc(x,y)    GC_debug_realloc ((x), (y), __FILE__, __LINE__)
-#define free(x)         GC_debug_free (x)
-#define calloc(x,y)     malloc((x) * (y))
-#define strdup(x)       gc_strdup((x))
-
-#endif /* WITH_BOEHM_GC */