diff options
| author | dgp <dgp@users.sourceforge.net> | 2002-08-05 15:01:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2002-08-05 15:01:01 (GMT) |
| commit | 67ca3bc02a763d338724a1afb2162e4c4a113e56 (patch) | |
| tree | 539a2b1951a7f7862046181f77737b3fd35b57d2 /generic | |
| parent | b3debf8fa6252ac20fea32f74530a37a1b013ba3 (diff) | |
| download | tcl-67ca3bc02a763d338724a1afb2162e4c4a113e56.zip tcl-67ca3bc02a763d338724a1afb2162e4c4a113e56.tar.gz tcl-67ca3bc02a763d338724a1afb2162e4c4a113e56.tar.bz2 | |
* generic/tcl.decls: Restored Tcl_Concat to return (char *). Like
* generic/tclDecls.h: Tcl_Merge, it transfers ownership of a dynamic
* generic/tclUtil.c: allocated string to the caller.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.decls | 4 | ||||
| -rw-r--r-- | generic/tclDecls.h | 6 | ||||
| -rw-r--r-- | generic/tclUtil.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index faf06bd..7cfb65b 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tcl.decls,v 1.92 2002/08/05 03:24:39 dgp Exp $ +# RCS: @(#) $Id: tcl.decls,v 1.93 2002/08/05 15:01:03 dgp Exp $ library tcl @@ -306,7 +306,7 @@ declare 82 generic { int Tcl_CommandComplete(CONST char *cmd) } declare 83 generic { - CONST84_RETURN char * Tcl_Concat(int argc, CONST84 char * CONST *argv) + char * Tcl_Concat(int argc, CONST84 char * CONST *argv) } declare 84 generic { int Tcl_ConvertElement(CONST char *src, char *dst, int flags) diff --git a/generic/tclDecls.h b/generic/tclDecls.h index a0a8b4b..10ff07a 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDecls.h,v 1.92 2002/08/05 03:24:40 dgp Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.93 2002/08/05 15:01:04 dgp Exp $ */ #ifndef _TCLDECLS @@ -274,7 +274,7 @@ EXTERN int Tcl_Close _ANSI_ARGS_((Tcl_Interp * interp, /* 82 */ EXTERN int Tcl_CommandComplete _ANSI_ARGS_((CONST char * cmd)); /* 83 */ -EXTERN CONST84_RETURN char * Tcl_Concat _ANSI_ARGS_((int argc, +EXTERN char * Tcl_Concat _ANSI_ARGS_((int argc, CONST84 char * CONST * argv)); /* 84 */ EXTERN int Tcl_ConvertElement _ANSI_ARGS_((CONST char * src, @@ -1674,7 +1674,7 @@ typedef struct TclStubs { void (*tcl_CancelIdleCall) _ANSI_ARGS_((Tcl_IdleProc * idleProc, ClientData clientData)); /* 80 */ int (*tcl_Close) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 81 */ int (*tcl_CommandComplete) _ANSI_ARGS_((CONST char * cmd)); /* 82 */ - CONST84_RETURN char * (*tcl_Concat) _ANSI_ARGS_((int argc, CONST84 char * CONST * argv)); /* 83 */ + char * (*tcl_Concat) _ANSI_ARGS_((int argc, CONST84 char * CONST * argv)); /* 83 */ int (*tcl_ConvertElement) _ANSI_ARGS_((CONST char * src, char * dst, int flags)); /* 84 */ int (*tcl_ConvertCountedElement) _ANSI_ARGS_((CONST char * src, int length, char * dst, int flags)); /* 85 */ int (*tcl_CreateAlias) _ANSI_ARGS_((Tcl_Interp * slave, CONST char * slaveCmd, Tcl_Interp * target, CONST char * targetCmd, int argc, CONST84 char * CONST * argv)); /* 86 */ diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 683f752..8bb3d1b 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUtil.c,v 1.33 2002/08/05 03:24:41 dgp Exp $ + * RCS: @(#) $Id: tclUtil.c,v 1.34 2002/08/05 15:01:05 dgp Exp $ */ #include "tclInt.h" @@ -947,7 +947,7 @@ Tcl_Backslash(src, readPtr) *---------------------------------------------------------------------- */ -CONST char * +char * Tcl_Concat(argc, argv) int argc; /* Number of strings to concatenate. */ CONST char * CONST *argv; /* Array of strings to concatenate. */ |