diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-27 11:42:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-27 11:42:12 (GMT) |
| commit | e0087267dfcc2f5340cb0ca19d97f65ae198beb0 (patch) | |
| tree | 0678341be2d455b1e33e3e1f29b6d92fc7d99efd /generic | |
| parent | a2bc74984c84ac28c1f9116c73ee22b237f36539 (diff) | |
| parent | 052144cb1fd693cf17ac2ebdf15272268d16a57d (diff) | |
| download | tcl-e0087267dfcc2f5340cb0ca19d97f65ae198beb0.zip tcl-e0087267dfcc2f5340cb0ca19d97f65ae198beb0.tar.gz tcl-e0087267dfcc2f5340cb0ca19d97f65ae198beb0.tar.bz2 | |
Merge 8.6 and fix Travis build on Windows
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclMain.c | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c index 3423e29..08c1fe0 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -43,26 +43,19 @@ # define _tcscmp strcmp #endif -/* - * Further on, in UNICODE mode we just use Tcl_NewUnicodeObj, otherwise - * NewNativeObj is needed (which provides proper conversion from native - * encoding to UTF-8). - */ - -#ifdef UNICODE -# define NewNativeObj Tcl_NewUnicodeObj -#else /* !UNICODE */ static inline Tcl_Obj * NewNativeObj( - char *string, - int length) + TCHAR *string) { Tcl_DString ds; - Tcl_ExternalToUtfDString(NULL, string, length, &ds); +#ifdef UNICODE + Tcl_WinTCharToUtf(string, -1, &ds); +#else + Tcl_ExternalToUtfDString(NULL, (char *) string, -1, &ds); +#endif return TclDStringToObj(&ds); } -#endif /* !UNICODE */ /* * Declarations for various library functions and variables (don't want to @@ -124,7 +117,7 @@ static void Prompt(Tcl_Interp *interp, InteractiveState *isPtr); static void StdinProc(ClientData clientData, int mask); static void FreeMainInterp(ClientData clientData); -#ifndef UNKCODE +#if !defined(_WIN32) || defined(UNICODE) static Tcl_ThreadDataKey dataKey; /* @@ -269,7 +262,7 @@ Tcl_SourceRCFile( Tcl_DStringFree(&temp); } } -#endif /* !UNKCODE */ +#endif /* !UNICODE */ /*---------------------------------------------------------------------- * @@ -331,14 +324,14 @@ Tcl_MainEx( if ((argc > 3) && (0 == _tcscmp(TEXT("-encoding"), argv[1])) && ('-' != argv[3][0])) { - Tcl_Obj *value = NewNativeObj(argv[2], -1); - Tcl_SetStartupScript(NewNativeObj(argv[3], -1), + Tcl_Obj *value = NewNativeObj(argv[2]); + Tcl_SetStartupScript(NewNativeObj(argv[3]), Tcl_GetString(value)); Tcl_DecrRefCount(value); argc -= 3; argv += 3; } else if ((argc > 1) && ('-' != argv[1][0])) { - Tcl_SetStartupScript(NewNativeObj(argv[1], -1), NULL); + Tcl_SetStartupScript(NewNativeObj(argv[1]), NULL); argc--; argv++; } @@ -346,7 +339,7 @@ Tcl_MainEx( path = Tcl_GetStartupScript(&encodingName); if (path == NULL) { - appName = NewNativeObj(argv[0], -1); + appName = NewNativeObj(argv[0]); } else { appName = path; } @@ -358,7 +351,7 @@ Tcl_MainEx( argvPtr = Tcl_NewListObj(0, NULL); while (argc--) { - Tcl_ListObjAppendElement(NULL, argvPtr, NewNativeObj(*argv++, -1)); + Tcl_ListObjAppendElement(NULL, argvPtr, NewNativeObj(*argv++)); } Tcl_SetVar2Ex(interp, "argv", NULL, argvPtr, TCL_GLOBAL_ONLY); @@ -640,7 +633,7 @@ Tcl_Main( } #endif /* TCL_MAJOR_VERSION == 8 && !UNICODE */ -#ifndef UNKCODE +#if !defined(_WIN32) || defined(UNICODE) /* *--------------------------------------------------------------- @@ -731,7 +724,7 @@ TclFullFinalizationRequested(void) return finalize; #endif /* PURIFY */ } -#endif /* !UNKCODE */ +#endif /* UNICODE */ /* *---------------------------------------------------------------------- |