# HG changeset patch
# User lbatlle@npdl268.bpo.hp.com
# Date 1186670275 -7200
# Node ID 9d33b442d12c0c50dcdc42e8463460e8615850e8
# Parent  e282978c28b97532f326e535c09c95be9a39e291
Fixed a merge bug on accept().



diff -r e282978c28b9 -r 9d33b442d12c tcpscript.c
--- a/tcpscript.c	Thu Aug 09 16:32:38 2007 +0200
+++ b/tcpscript.c	Thu Aug 09 16:37:55 2007 +0200
@@ -332,7 +332,6 @@
 dooutput() {
 	int cc;
 	char obuf[BUFSIZ];
-    int accept_socket;
     int i;
 
 /*	(void) close(0); lets use it in resize*/