diff options
| author | mig <mig> | 2013-02-11 13:50:47 (GMT) |
|---|---|---|
| committer | mig <mig> | 2013-02-11 13:50:47 (GMT) |
| commit | 0055995ec13ad8f27603d140ca19d7858725ef95 (patch) | |
| tree | 14f5697a44b71bd7eb3091709c9cac4fe3868025 /generic/tclPathObj.c | |
| parent | eb1adf553cfd18472faa6c11b1d46434c15e064f (diff) | |
| parent | 30f60173c4738c76675b58db3a7a5aaa62ca79ea (diff) | |
| download | tcl-mig_alloc_reform.zip tcl-mig_alloc_reform.tar.gz tcl-mig_alloc_reform.tar.bz2 | |
merge trunkmig_alloc_reform
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index 2b9ff87..b7f3dcf 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -109,9 +109,9 @@ typedef struct FsPath { * fields. */ -#define PATHOBJ(pathPtr) ((FsPath *) (pathPtr)->internalRep.otherValuePtr) +#define PATHOBJ(pathPtr) ((FsPath *) (pathPtr)->internalRep.twoPtrValue.ptr1) #define SETPATHOBJ(pathPtr,fsPathPtr) \ - ((pathPtr)->internalRep.otherValuePtr = (void *) (fsPathPtr)) + ((pathPtr)->internalRep.twoPtrValue.ptr1 = (void *) (fsPathPtr)) #define PATHFLAGS(pathPtr) (PATHOBJ(pathPtr)->flags) /* @@ -1156,7 +1156,7 @@ Tcl_FSConvertToPathType( FreeFsPathInternalRep(pathPtr); } - return Tcl_ConvertToType(interp, pathPtr, &tclFsPathType); + return SetFsPathFromAny(interp, pathPtr); /* * We used to have more complex code here: @@ -1873,7 +1873,7 @@ Tcl_FSGetNormalizedPath( UpdateStringOfFsPath(pathPtr); } FreeFsPathInternalRep(pathPtr); - if (Tcl_ConvertToType(interp, pathPtr, &tclFsPathType) != TCL_OK) { + if (SetFsPathFromAny(interp, pathPtr) != TCL_OK) { return NULL; } fsPathPtr = PATHOBJ(pathPtr); |