--- libwww/Library/src/HTMerge.c	1998/05/04 19:36:59	2.2
+++ libwww/Library/src/HTMerge.c	1999/02/22 22:10:11	2.3
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTMerge.c,v 2.2 1998/05/04 19:36:59 frystyk Exp $
+**	@(#) $Id: HTMerge.c,v 2.3 1999/02/22 22:10:11 frystyk Exp $
 **
 **	The Merge class just is a n entry stream. Easy. The reason for having
 **	this stream is that we must be able to handle free and abort in an
@@ -56,8 +56,7 @@ PRIVATE int HTMerge_flush (HTStream * me
 PRIVATE int HTMerge_free (HTStream * me)
 {
     if (me) {
-	if (STREAM_TRACE)
-	    HTTrace("Merge Free.. Called with %d feeds\n", me->feeds);
+	HTTRACE(STREAM_TRACE, "Merge Free.. Called with %d feeds\n" _ me->feeds);
 	if (--me->feeds <= 0) {
 	    (*me->target->isa->_free)(me->target);
 	    HT_FREE(me);
@@ -70,8 +69,7 @@ PRIVATE int HTMerge_free (HTStream * me)
 PRIVATE int HTMerge_abort (HTStream * me, HTList * e)
 {
     if (me) {
-	if (STREAM_TRACE)
-	    HTTrace("Merge Abort. Called with %d feeds\n", me->feeds);
+	HTTRACE(STREAM_TRACE, "Merge Abort. Called with %d feeds\n" _ me->feeds);
 	if (--me->feeds <= 0) {
 	    (*me->target->isa->abort)(me->target, e);
 	    HT_FREE(me);
@@ -99,6 +97,6 @@ PUBLIC HTStream * HTMerge (HTStream * ta
     me->isa = &HTMergeClass;
     me->target = target ? target : HTBlackHole();
     me->feeds = feeds >= 1 ? feeds : 1;			       /* Min 1 feed */
-    if (STREAM_TRACE) HTTrace("Merge....... Created stream %p\n", me);
+    HTTRACE(STREAM_TRACE, "Merge....... Created stream %p\n" _ me);
     return me;
 }