Index: ossp-pkg/lmtp2nntp/lmtp2nntp_argz.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_argz.c,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_argz.c,v' 2>/dev/null
--- lmtp2nntp_argz.c	2003/02/10 10:13:12	1.5
+++ lmtp2nntp_argz.c	2003/02/12 16:16:29	1.6
@@ -55,7 +55,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(HAVE_DMALLOC_H) && defined(DMALLOC)
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
 #include "dmalloc.h"
 #endif
 
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_config.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_config.c,v
rcsdiff -q -kk '-r1.92' '-r1.93' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_config.c,v' 2>/dev/null
--- lmtp2nntp_config.c	2003/02/10 13:51:34	1.92
+++ lmtp2nntp_config.c	2003/02/12 16:16:29	1.93
@@ -58,7 +58,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(HAVE_DMALLOC_H) && defined(DMALLOC)
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
 #include "dmalloc.h"
 #endif
 #include "lmtp2nntp_option.h"
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_daemon.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_daemon.c,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_daemon.c,v' 2>/dev/null
--- lmtp2nntp_daemon.c	2003/02/10 10:13:12	1.4
+++ lmtp2nntp_daemon.c	2003/02/12 16:16:29	1.5
@@ -36,6 +36,9 @@
 #ifdef HAVE_TERMIOS_H
 #include <sys/termios.h>
 #endif
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
+#include "dmalloc.h"
+#endif
 
 #include "lmtp2nntp_daemon.h"
 
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_exwrap.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_exwrap.c,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_exwrap.c,v' 2>/dev/null
--- lmtp2nntp_exwrap.c	2003/02/12 16:15:13	1.4
+++ lmtp2nntp_exwrap.c	2003/02/12 16:16:29	1.5
@@ -28,6 +28,12 @@
 
 #include <string.h>
 #include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
+#include "dmalloc.h"
+#endif
 
 /* own headers */
 #include "lmtp2nntp_global.h"
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_global.h
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_global.h,v
rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_global.h,v' 2>/dev/null
--- lmtp2nntp_global.h	2003/02/10 10:13:12	1.7
+++ lmtp2nntp_global.h	2003/02/12 16:16:29	1.8
@@ -32,7 +32,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(HAVE_DMALLOC_H) && defined(DMALLOC)
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
 #include "dmalloc.h"
 #endif
 
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_l2.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_l2.c,v
rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_l2.c,v' 2>/dev/null
--- lmtp2nntp_l2.c	2003/02/11 13:40:57	1.7
+++ lmtp2nntp_l2.c	2003/02/12 16:16:29	1.8
@@ -28,6 +28,12 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
+#include "dmalloc.h"
+#endif
 #include "lmtp2nntp_common.h"
 
 /* declare private channel configuration */
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_lmtp.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_lmtp.c,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_lmtp.c,v' 2>/dev/null
--- lmtp2nntp_lmtp.c	2003/02/10 10:13:12	1.5
+++ lmtp2nntp_lmtp.c	2003/02/12 16:16:29	1.6
@@ -38,7 +38,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(HAVE_DMALLOC_H) && defined(DMALLOC)
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
 #include "dmalloc.h"
 #endif
 
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_main.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v
rcsdiff -q -kk '-r1.75' '-r1.76' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v' 2>/dev/null
--- lmtp2nntp_main.c	2003/02/12 16:08:26	1.75
+++ lmtp2nntp_main.c	2003/02/12 16:16:29	1.76
@@ -75,7 +75,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(HAVE_DMALLOC_H) && defined(DMALLOC)
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
 #include "dmalloc.h"
 #endif
 #include "lmtp2nntp_option.h"
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_nntp.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_nntp.c,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_nntp.c,v' 2>/dev/null
--- lmtp2nntp_nntp.c	2003/02/10 10:13:12	1.5
+++ lmtp2nntp_nntp.c	2003/02/12 16:16:29	1.6
@@ -40,7 +40,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(HAVE_DMALLOC_H) && defined(DMALLOC)
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
 #include "dmalloc.h"
 #endif
 
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_option.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_option.c,v
rcsdiff -q -kk '-r1.31' '-r1.32' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_option.c,v' 2>/dev/null
--- lmtp2nntp_option.c	2003/02/11 20:24:42	1.31
+++ lmtp2nntp_option.c	2003/02/12 16:16:29	1.32
@@ -52,7 +52,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(HAVE_DMALLOC_H) && defined(DMALLOC)
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
 #include "dmalloc.h"
 #endif
 #include "lmtp2nntp_option.h"
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_shpat.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_shpat.c,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_shpat.c,v' 2>/dev/null
--- lmtp2nntp_shpat.c	2003/02/10 10:13:12	1.5
+++ lmtp2nntp_shpat.c	2003/02/12 16:16:29	1.6
@@ -74,7 +74,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(HAVE_DMALLOC_H) && defined(DMALLOC)
+#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
 #include "dmalloc.h"
 #endif