thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1185

Browse Source 
Problem:    Can't build with TCL on some systems.
Solution:   Rename the channel_ functions.
This commit is contained in:
Bram Moolenaar
2016-01-27 11:07:47 +01:00
parent 54e09e7198
commit 0d6f835683
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/if_tcl.c
View File

@@ -1555,7 +1555,7 @@ tclsetdelcmd(interp, reflist, vimobj, delcmd)
********************************************/ ********************************************/
static int static int
channel_close(instance, interp) tcl_channel_close(instance, interp)
ClientData instance; ClientData instance;
Tcl_Interp *interp UNUSED; Tcl_Interp *interp UNUSED;
{ {
@@ -1572,7 +1572,7 @@ channel_close(instance, interp)
} }
static int static int
channel_input(instance, buf, bufsiz, errptr) tcl_channel_input(instance, buf, bufsiz, errptr)
ClientData instance UNUSED; ClientData instance UNUSED;
char *buf UNUSED; char *buf UNUSED;
int bufsiz UNUSED; int bufsiz UNUSED;
@@ -1588,7 +1588,7 @@ channel_input(instance, buf, bufsiz, errptr)
} }
static int static int
channel_output(instance, buf, bufsiz, errptr) tcl_channel_output(instance, buf, bufsiz, errptr)
ClientData instance; ClientData instance;
char *buf; char *buf;
int bufsiz; int bufsiz;
@@ -1628,7 +1628,7 @@ channel_output(instance, buf, bufsiz, errptr)
} }
static void static void
channel_watch(instance, mask) tcl_channel_watch(instance, mask)
ClientData instance UNUSED; ClientData instance UNUSED;
int mask UNUSED; int mask UNUSED;
{ {
@@ -1636,7 +1636,7 @@ channel_watch(instance, mask)
} }
static int static int
channel_gethandle(instance, direction, handleptr) tcl_channel_gethandle(instance, direction, handleptr)
ClientData instance UNUSED; ClientData instance UNUSED;
int direction UNUSED; int direction UNUSED;
ClientData *handleptr UNUSED; ClientData *handleptr UNUSED;
@@ -1646,18 +1646,18 @@ channel_gethandle(instance, direction, handleptr)
} }
static Tcl_ChannelType channel_type = static Tcl_ChannelType tcl_channel_type =
{ {
"vimmessage", /* typeName */ "vimmessage", /* typeName */
TCL_CHANNEL_VERSION_2, /* version */ TCL_CHANNEL_VERSION_2, /* version */
channel_close, /* closeProc */ tcl_channel_close, /* closeProc */
channel_input, /* inputProc */ tcl_channel_input, /* inputProc */
channel_output, /* outputProc */ tcl_channel_output, /* outputProc */
NULL, /* seekProc */ NULL, /* seekProc */
NULL, /* setOptionProc */ NULL, /* setOptionProc */
NULL, /* getOptionProc */ NULL, /* getOptionProc */
channel_watch, /* watchProc */ tcl_channel_watch, /* watchProc */
channel_gethandle, /* getHandleProc */ tcl_channel_gethandle, /* getHandleProc */
NULL, /* close2Proc */ NULL, /* close2Proc */
NULL, /* blockModeProc */ NULL, /* blockModeProc */
#ifdef TCL_CHANNEL_VERSION_2 #ifdef TCL_CHANNEL_VERSION_2
@@ -1732,8 +1732,8 @@ tclinit(eap)
/* Create replacement channels for stdout and stderr; this has to be /* Create replacement channels for stdout and stderr; this has to be
* done each time an interpreter is created since the channels are closed * done each time an interpreter is created since the channels are closed
* when the interpreter is deleted */ * when the interpreter is deleted */
ch1 = Tcl_CreateChannel(&channel_type, "vimout", VIMOUT, TCL_WRITABLE); ch1 = Tcl_CreateChannel(&tcl_channel_type, "vimout", VIMOUT, TCL_WRITABLE);
ch2 = Tcl_CreateChannel(&channel_type, "vimerr", VIMERR, TCL_WRITABLE); ch2 = Tcl_CreateChannel(&tcl_channel_type, "vimerr", VIMERR, TCL_WRITABLE);
Tcl_SetStdChannel(ch1, TCL_STDOUT); Tcl_SetStdChannel(ch1, TCL_STDOUT);
Tcl_SetStdChannel(ch2, TCL_STDERR); Tcl_SetStdChannel(ch2, TCL_STDERR);

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1185,
/**/ /**/
1184, 1184,
/**/ /**/