# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1269151642 0
# Node ID 0d43d4ea4819115e5ab8e336410aa85fab4b2aed
# Parent  6b9d124779533072a089e7b0cfeb1ad34787fdd9# Parent  6cb1bd7be8b39107d0735f8689e13ce2a973b786
merge of '0adbc6745a5ada0b6780b0683209f5b26b1a335d'
     and 'a014a978f213e6ff424e7d10794ae426375f3191'

diff -r 6cb1bd7be8b3 -r 0d43d4ea4819 cli-chansession.c
--- a/cli-chansession.c	Thu Mar 04 14:50:19 2010 +0000
+++ b/cli-chansession.c	Sun Mar 21 06:07:22 2010 +0000
@@ -381,7 +381,7 @@
 
 #ifdef ENABLE_CLI_NETCAT
 
-const struct ChanType cli_chan_netcat = {
+static const struct ChanType cli_chan_netcat = {
 	0, /* sepfds */
 	"direct-tcpip",
 	cli_init_stdpipe_sess, /* inithandler */