# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1453889706 -3600
# Node ID d30f4f9b102483b7dbdecfeb0c69e9e6c40d6e77
# Parent  72ed080e6e4b881559e7720e09df0873a76e2362
commit https://github.com/vim/vim/commit/0d6f835683bede8bfa171c2518dce10832eb8226
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jan 27 11:07:47 2016 +0100

    patch 7.4.1185
    Problem:    Can't build with TCL on some systems.
    Solution:   Rename the channel_ functions.

diff --git a/src/if_tcl.c b/src/if_tcl.c
--- a/src/if_tcl.c
+++ b/src/if_tcl.c
@@ -1555,7 +1555,7 @@ tclsetdelcmd(interp, reflist, vimobj, de
 ********************************************/
 
     static int
-channel_close(instance, interp)
+tcl_channel_close(instance, interp)
     ClientData	instance;
     Tcl_Interp	*interp UNUSED;
 {
@@ -1572,7 +1572,7 @@ channel_close(instance, interp)
 }
 
     static int
-channel_input(instance, buf, bufsiz, errptr)
+tcl_channel_input(instance, buf, bufsiz, errptr)
     ClientData	instance UNUSED;
     char	*buf UNUSED;
     int		bufsiz UNUSED;
@@ -1588,7 +1588,7 @@ channel_input(instance, buf, bufsiz, err
 }
 
     static int
-channel_output(instance, buf, bufsiz, errptr)
+tcl_channel_output(instance, buf, bufsiz, errptr)
     ClientData	instance;
     char	*buf;
     int		bufsiz;
@@ -1628,7 +1628,7 @@ channel_output(instance, buf, bufsiz, er
 }
 
     static void
-channel_watch(instance, mask)
+tcl_channel_watch(instance, mask)
     ClientData	instance UNUSED;
     int		mask UNUSED;
 {
@@ -1636,7 +1636,7 @@ channel_watch(instance, mask)
 }
 
     static int
-channel_gethandle(instance, direction, handleptr)
+tcl_channel_gethandle(instance, direction, handleptr)
     ClientData	instance UNUSED;
     int		direction UNUSED;
     ClientData	*handleptr UNUSED;
@@ -1646,18 +1646,18 @@ channel_gethandle(instance, direction, h
 }
 
 
-static Tcl_ChannelType channel_type =
+static Tcl_ChannelType tcl_channel_type =
 {
     "vimmessage",	/* typeName */
     TCL_CHANNEL_VERSION_2, /* version */
-    channel_close,	/* closeProc */
-    channel_input,	/* inputProc */
-    channel_output,	/* outputProc */
+    tcl_channel_close,	/* closeProc */
+    tcl_channel_input,	/* inputProc */
+    tcl_channel_output,	/* outputProc */
     NULL,		/* seekProc */
     NULL,		/* setOptionProc */
     NULL,		/* getOptionProc */
-    channel_watch,	/* watchProc */
-    channel_gethandle,	/* getHandleProc */
+    tcl_channel_watch,	/* watchProc */
+    tcl_channel_gethandle, /* getHandleProc */
     NULL,		/* close2Proc */
     NULL,		/* blockModeProc */
 #ifdef TCL_CHANNEL_VERSION_2
@@ -1732,8 +1732,8 @@ tclinit(eap)
 	/* Create replacement channels for stdout and stderr; this has to be
 	 * done each time an interpreter is created since the channels are closed
 	 * when the interpreter is deleted */
-	ch1 = Tcl_CreateChannel(&channel_type, "vimout", VIMOUT, TCL_WRITABLE);
-	ch2 = Tcl_CreateChannel(&channel_type, "vimerr", VIMERR, TCL_WRITABLE);
+	ch1 = Tcl_CreateChannel(&tcl_channel_type, "vimout", VIMOUT, TCL_WRITABLE);
+	ch2 = Tcl_CreateChannel(&tcl_channel_type, "vimerr", VIMERR, TCL_WRITABLE);
 	Tcl_SetStdChannel(ch1, TCL_STDOUT);
 	Tcl_SetStdChannel(ch2, TCL_STDERR);
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1185,
+/**/
     1184,
 /**/
     1183,