diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-12 12:00:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-12 12:00:11 (GMT) |
| commit | d2ef001c4971191280470eca5f1cf9dc1e2d8070 (patch) | |
| tree | db4a77927de2a4d6c6cf2bc672ebda4098b9b1a0 /macosx/tclMacOSXFCmd.c | |
| parent | b4b8dd8fff2ee43a04eb72c864dd5521577ee029 (diff) | |
| parent | 9b4213bb3f91778b852b5b3bf24904dfb7e6b04b (diff) | |
| download | tcl-d2ef001c4971191280470eca5f1cf9dc1e2d8070.zip tcl-d2ef001c4971191280470eca5f1cf9dc1e2d8070.tar.gz tcl-d2ef001c4971191280470eca5f1cf9dc1e2d8070.tar.bz2 | |
merge trunk
Diffstat (limited to 'macosx/tclMacOSXFCmd.c')
| -rw-r--r-- | macosx/tclMacOSXFCmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c index 8ecfd0b..75fda4b 100644 --- a/macosx/tclMacOSXFCmd.c +++ b/macosx/tclMacOSXFCmd.c @@ -106,7 +106,7 @@ typedef struct finderinfo { u_int32_t extendedFileInfo[4]; } __attribute__ ((__packed__)) finderinfo; -typedef struct fileinfobuf { +typedef struct { u_int32_t info_length; u_int32_t data[8]; } fileinfobuf; @@ -636,12 +636,12 @@ SetOSTypeFromAny( Tcl_Obj *objPtr) /* Pointer to the object to convert */ { const char *string; - int length, result = TCL_OK; + int result = TCL_OK; Tcl_DString ds; Tcl_Encoding encoding = Tcl_GetEncoding(NULL, "macRoman"); - string = Tcl_GetStringFromObj(objPtr, &length); - Tcl_UtfToExternalDString(encoding, string, length, &ds); + string = TclGetString(objPtr); + Tcl_UtfToExternalDString(encoding, string, objPtr->length, &ds); if (Tcl_DStringLength(&ds) > 4) { if (interp) { |