---------------------
PatchSet 3525 
Date: 2001/12/28 15:41:21
Author: serassio
Branch: cygwin
Tag: (none) 
Log:
Fixed merge inconsistency with HEAD

Members: 
	src/debug.c:1.3.26.11->1.3.26.12 

Index: squid/src/debug.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/debug.c,v
retrieving revision 1.3.26.11
retrieving revision 1.3.26.12
diff -u -r1.3.26.11 -r1.3.26.12
--- squid/src/debug.c	19 Dec 2001 20:55:50 -0000	1.3.26.11
+++ squid/src/debug.c	28 Dec 2001 15:41:21 -0000	1.3.26.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: debug.c,v 1.3.26.11 2001/12/19 20:55:50 serassio Exp $
+ * $Id: debug.c,v 1.3.26.12 2001/12/28 15:41:21 serassio Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -57,7 +57,9 @@
 #endif
     LOCAL_ARRAY(char, f, BUFSIZ);
     va_list args1;
+    
 #if STDC_HEADERS
+
     va_list args2;
     va_list args3;
 #else