Attachment "console.patch" to
ticket [503983ffff]
added by
dgp
2002-01-16 03:47:17.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tktoolkit/tk/ChangeLog,v
retrieving revision 1.411
diff -u -u -r1.411 ChangeLog
--- ChangeLog 2002/01/15 18:19:14 1.411
+++ ChangeLog 2002/01/15 20:43:56
@@ -1,8 +1,10 @@
2002-01-04 Don Porter <dgp@users.sourceforge.net>
- * generic/tkConsole.c (ConsoleOutputProc): Updated Tk's console
- to CONSTified channel driver interface. [Tcl Patch 503565,
- Tk Patch 503983]
+ * generic/tkConsole.c (ConsoleOutputProc,TkConsolePrint):
+ * generic/tkInt.h (TkConsolePrint):
+ * mac/tkMacAppInit.c (TkConsolePrint): Updated Tk's console to
+ CONSTified channel driver interface. [Tcl Patch 503565, Tk Patch
+ 503983]
2002-01-11 Mo DeJong <mdejong@users.sourceforge.net>
Index: generic/tkConsole.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkConsole.c,v
retrieving revision 1.15
diff -u -u -r1.15 tkConsole.c
--- generic/tkConsole.c 2002/01/15 18:19:14 1.15
+++ generic/tkConsole.c 2002/01/15 20:43:56
@@ -47,9 +47,6 @@
* The first three will be used in the tk app shells...
*/
-void TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp,
- int devId, char *buffer, long size));
-
static int ConsoleCmd _ANSI_ARGS_((ClientData clientData,
Tcl_Interp *interp, int argc, char **argv));
static void ConsoleDeleteProc _ANSI_ARGS_((ClientData clientData));
@@ -61,7 +58,7 @@
static int ConsoleInput _ANSI_ARGS_((ClientData instanceData,
char *buf, int toRead, int *errorCode));
static int ConsoleOutput _ANSI_ARGS_((ClientData instanceData,
- char *buf, int toWrite, int *errorCode));
+ CONST char *buf, int toWrite, int *errorCode));
static int ConsoleClose _ANSI_ARGS_((ClientData instanceData,
Tcl_Interp *interp));
static void ConsoleWatch _ANSI_ARGS_((ClientData instanceData,
@@ -408,7 +405,7 @@
static int
ConsoleOutput(instanceData, buf, toWrite, errorCode)
ClientData instanceData; /* Indicates which device to use. */
- char *buf; /* The data buffer. */
+ CONST char *buf; /* The data buffer. */
int toWrite; /* How many bytes to write? */
int *errorCode; /* Where to store error code. */
{
@@ -778,7 +775,7 @@
Tcl_Interp *interp; /* Main interpreter. */
int devId; /* TCL_STDOUT for stdout, TCL_STDERR for
* stderr. */
- char *buffer; /* Text buffer. */
+ CONST char *buffer; /* Text buffer. */
long size; /* Size of text buffer. */
{
Tcl_DString command, output;
Index: generic/tkInt.h
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkInt.h,v
retrieving revision 1.40
diff -u -u -r1.40 tkInt.h
--- generic/tkInt.h 2001/09/26 21:36:19 1.40
+++ generic/tkInt.h 2002/01/15 20:43:57
@@ -1035,8 +1035,8 @@
EXTERN int Tk_WmCmd _ANSI_ARGS_((ClientData clientData,
Tcl_Interp *interp, int argc, char **argv));
-void TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp,
- int devId, char *buffer, long size));
+EXTERN void TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp,
+ int devId, CONST char *buffer, long size));
EXTERN void TkEventInit _ANSI_ARGS_((void));
Index: mac/tkMacAppInit.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/mac/tkMacAppInit.c,v
retrieving revision 1.12
diff -u -u -r1.12 tkMacAppInit.c
--- mac/tkMacAppInit.c 2000/02/10 08:53:06 1.12
+++ mac/tkMacAppInit.c 2002/01/15 20:43:57
@@ -52,12 +52,6 @@
short SIOUXHandleOneEvent _ANSI_ARGS_((EventRecord *event));
/*
- * Prototypes for functions from the tkConsole.c file.
- */
-
-EXTERN void TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp,
- int devId, char *buffer, long size));
-/*
* Forward declarations for procedures defined later in this file:
*/