diff options
author | dgp <dgp@noemail.net> | 2002-02-08 02:52:54 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2002-02-08 02:52:54 (GMT) |
commit | 6a12c0dadeb89e906c1fd6b83568cd7893c7405f (patch) | |
tree | 078abed0538e74a4b78aa55d46462fe102978f63 /generic/tclPlatDecls.h | |
parent | 0c266f2183e83ccf891f58b150c0674376500a00 (diff) | |
download | tcl-6a12c0dadeb89e906c1fd6b83568cd7893c7405f.zip tcl-6a12c0dadeb89e906c1fd6b83568cd7893c7405f.tar.gz tcl-6a12c0dadeb89e906c1fd6b83568cd7893c7405f.tar.bz2 |
* Partial TIP 27 rollback. Following routines
restored to return (char *): Tcl_DStringAppend,
Tcl_DStringAppendElement, Tcl_JoinPath, Tcl_TranslateFileName,
Tcl_ExternalToUtfDString, Tcl_UtfToExternalDString,
Tcl_UniCharToUtfDString, Tcl_GetCwd, Tcl_WinTCharToUtf. Also
restored Tcl_WinUtfToTChar to return (TCHAR *) and
Tcl_UtfToUniCharDString to return (Tcl_UniChar *). Modified
some callers. This change recognizes that Tcl_DStrings are
de-facto white-box objects.
* generic/tclCmdMZ.c: corrected use of C++-style comment.
FossilOrigin-Name: bb1a244cde9f05a5477cf5dd8e8ab44cd978459f
Diffstat (limited to 'generic/tclPlatDecls.h')
-rw-r--r-- | generic/tclPlatDecls.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index 3425a9a..c499d29 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -6,7 +6,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclPlatDecls.h,v 1.15 2002/01/28 12:23:06 davygrvy Exp $ + * RCS: @(#) $Id: tclPlatDecls.h,v 1.16 2002/02/08 02:52:54 dgp Exp $ */ #ifndef _TCLPLATDECLS @@ -36,10 +36,10 @@ #ifdef __WIN32__ /* 0 */ -EXTERN CONST TCHAR * Tcl_WinUtfToTChar _ANSI_ARGS_((CONST char * str, +EXTERN TCHAR * Tcl_WinUtfToTChar _ANSI_ARGS_((CONST char * str, int len, Tcl_DString * dsPtr)); /* 1 */ -EXTERN CONST char * Tcl_WinTCharToUtf _ANSI_ARGS_((CONST TCHAR * str, +EXTERN char * Tcl_WinTCharToUtf _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); #endif /* __WIN32__ */ #ifdef MAC_TCL @@ -80,8 +80,8 @@ typedef struct TclPlatStubs { struct TclPlatStubHooks *hooks; #ifdef __WIN32__ - CONST TCHAR * (*tcl_WinUtfToTChar) _ANSI_ARGS_((CONST char * str, int len, Tcl_DString * dsPtr)); /* 0 */ - CONST char * (*tcl_WinTCharToUtf) _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); /* 1 */ + TCHAR * (*tcl_WinUtfToTChar) _ANSI_ARGS_((CONST char * str, int len, Tcl_DString * dsPtr)); /* 0 */ + char * (*tcl_WinTCharToUtf) _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); /* 1 */ #endif /* __WIN32__ */ #ifdef MAC_TCL void (*tcl_MacSetEventProc) _ANSI_ARGS_((Tcl_MacConvertEventPtr procPtr)); /* 0 */ |