diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2011-06-01 14:54:52 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2011-06-01 14:54:52 (GMT) |
commit | 5d982178ea4904932de32a6331512d6db0174a91 (patch) | |
tree | cccd80e15a5ab4f773baa3a262941addef161e26 /generic/tclDecls.h | |
parent | 598a2d7dd6d3830c59de31a4b4af8ccf1991fdc4 (diff) | |
parent | c31b5e030892e09c7f5bdc8538ecc09b760bab3b (diff) | |
download | tcl-bug_3185407.zip tcl-bug_3185407.tar.gz tcl-bug_3185407.tar.bz2 |
Merge from 8.5 branch tipbug_3185407
Diffstat (limited to 'generic/tclDecls.h')
-rw-r--r-- | generic/tclDecls.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index b741475..4517d01 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1312,12 +1312,12 @@ EXTERN void Tcl_ResetResult(Tcl_Interp *interp); #ifndef Tcl_ScanElement_TCL_DECLARED #define Tcl_ScanElement_TCL_DECLARED /* 218 */ -EXTERN int Tcl_ScanElement(CONST char *str, int *flagPtr); +EXTERN int Tcl_ScanElement(CONST char *src, int *flagPtr); #endif #ifndef Tcl_ScanCountedElement_TCL_DECLARED #define Tcl_ScanCountedElement_TCL_DECLARED /* 219 */ -EXTERN int Tcl_ScanCountedElement(CONST char *str, int length, +EXTERN int Tcl_ScanCountedElement(CONST char *src, int length, int *flagPtr); #endif #ifndef Tcl_SeekOld_TCL_DECLARED @@ -3661,8 +3661,8 @@ typedef struct TclStubs { void (*tcl_RegExpRange) (Tcl_RegExp regexp, int index, CONST84 char **startPtr, CONST84 char **endPtr); /* 215 */ void (*tcl_Release) (ClientData clientData); /* 216 */ void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */ - int (*tcl_ScanElement) (CONST char *str, int *flagPtr); /* 218 */ - int (*tcl_ScanCountedElement) (CONST char *str, int length, int *flagPtr); /* 219 */ + int (*tcl_ScanElement) (CONST char *src, int *flagPtr); /* 218 */ + int (*tcl_ScanCountedElement) (CONST char *src, int length, int *flagPtr); /* 219 */ int (*tcl_SeekOld) (Tcl_Channel chan, int offset, int mode); /* 220 */ int (*tcl_ServiceAll) (void); /* 221 */ int (*tcl_ServiceEvent) (int flags); /* 222 */ |