summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-07-01 13:34:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-07-01 13:34:20 (GMT)
commitb6f5ea3c8ff54ed1e4e9f15893161b62f5267df1 (patch)
tree33105b7240fd7e45e9ba11b23e5dce475eb07332
parent680d1a1513ba885fd976e2ee52f6572fe9bf5b9f (diff)
parent38e85a2dbe88be11991f14a59ef71dcd65d5ad05 (diff)
downloadtcl-b6f5ea3c8ff54ed1e4e9f15893161b62f5267df1.zip
tcl-b6f5ea3c8ff54ed1e4e9f15893161b62f5267df1.tar.gz
tcl-b6f5ea3c8ff54ed1e4e9f15893161b62f5267df1.tar.bz2
merge core-8-6-branch
-rw-r--r--generic/tclTestObj.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index f36b07f..a637498 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -19,6 +19,7 @@
#endif
#include "tclInt.h"
#include "tommath.h"
+#include "tclStringRep.h"
/*
@@ -46,13 +47,6 @@ static int TestobjCmd(ClientData dummy, Tcl_Interp *interp,
int objc, Tcl_Obj *const objv[]);
static int TeststringobjCmd(ClientData dummy, Tcl_Interp *interp,
int objc, Tcl_Obj *const objv[]);
-
-typedef struct TestString {
- int numChars;
- int allocated;
- int maxChars;
- Tcl_UniChar unicode[2];
-} TestString;
#define VARPTR_KEY "TCLOBJTEST_VARPTR"
#define NUMBER_OF_OBJECT_VARS 20
@@ -1141,7 +1135,7 @@ TeststringobjCmd(
int varIndex, option, i, length;
#define MAX_STRINGS 11
const char *index, *string, *strings[MAX_STRINGS+1];
- TestString *strPtr;
+ String *strPtr;
Tcl_Obj **varPtr;
static const char *const options[] = {
"append", "appendstrings", "get", "get2", "length", "length2",