Fossil SCM

(cherry-pick): Make fossil work with Tcl 8.7 (still in alpha), even when Tcl is compiled with -DTCL_NO_DEPRECATED

jan.nijtmans 2019-02-24 22:54 trunk
Commit e869ad9c936daa3ae16793d68df548ebef6ada8ac7e75e21de19e5e129631514
Parent f8d7f76bfdfe26a…
2 files changed +8 -8 +8 -8
~ src/th_tcl.c ~ src/th_tcl.c
M src/th_tcl.c
+8 -8
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -98,11 +98,11 @@
9898
 # include <windows.h>
9999
 # ifndef TCL_DIRECTORY_SEP
100100
 # define TCL_DIRECTORY_SEP '\\'
101101
 # endif
102102
 # ifndef TCL_LIBRARY_NAME
103
-# define TCL_LIBRARY_NAME "tcl86.dll\0"
103
+# define TCL_LIBRARY_NAME "tcl87.dll\0"
104104
 # endif
105105
 # ifndef TCL_MINOR_OFFSET
106106
 # define TCL_MINOR_OFFSET (4)
107107
 # endif
108108
 # ifndef dlopen
@@ -119,32 +119,32 @@
119119
 # ifndef TCL_DIRECTORY_SEP
120120
 # define TCL_DIRECTORY_SEP '/'
121121
 # endif
122122
 # if defined(__CYGWIN__)
123123
 # ifndef TCL_LIBRARY_NAME
124
-# define TCL_LIBRARY_NAME "libtcl8.6.dll\0"
124
+# define TCL_LIBRARY_NAME "libtcl8.7.dll\0"
125125
 # endif
126126
 # ifndef TCL_MINOR_OFFSET
127127
 # define TCL_MINOR_OFFSET (8)
128128
 # endif
129129
 # elif defined(__APPLE__)
130130
 # ifndef TCL_LIBRARY_NAME
131
-# define TCL_LIBRARY_NAME "libtcl8.6.dylib\0"
131
+# define TCL_LIBRARY_NAME "libtcl8.7.dylib\0"
132132
 # endif
133133
 # ifndef TCL_MINOR_OFFSET
134134
 # define TCL_MINOR_OFFSET (8)
135135
 # endif
136136
 # elif defined(__FreeBSD__)
137137
 # ifndef TCL_LIBRARY_NAME
138
-# define TCL_LIBRARY_NAME "libtcl86.so\0"
138
+# define TCL_LIBRARY_NAME "libtcl87.so\0"
139139
 # endif
140140
 # ifndef TCL_MINOR_OFFSET
141141
 # define TCL_MINOR_OFFSET (7)
142142
 # endif
143143
 # else
144144
 # ifndef TCL_LIBRARY_NAME
145
-# define TCL_LIBRARY_NAME "libtcl8.6.so\0"
145
+# define TCL_LIBRARY_NAME "libtcl8.7.so\0"
146146
 # endif
147147
 # ifndef TCL_MINOR_OFFSET
148148
 # define TCL_MINOR_OFFSET (8)
149149
 # endif
150150
 # endif /* defined(__CYGWIN__) */
@@ -972,11 +972,11 @@
972972
 return TH_OK;
973973
 }
974974
 } while( --aFileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */
975975
 aFileName[TCL_MINOR_OFFSET] = 'x';
976976
 Th_ErrorMessage(interp,
977
- "could not load any supported Tcl 8.6, 8.5, or 8.4 shared library \"",
977
+ "could not load any supported Tcl 8.x shared library \"",
978978
 aFileName, -1);
979979
 return TH_ERROR;
980980
 #else
981981
 *phLibrary = 0;
982982
 *pxFindExecutable = Tcl_FindExecutable;
@@ -1010,11 +1010,11 @@
10101010
 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
10111011
 Tcl_DecrRefCount(objPtr); objPtr = 0;
10121012
 if( !resultObjPtr ){
10131013
 return TCL_ERROR;
10141014
 }
1015
- objPtr = Tcl_NewIntObj(argc - 1);
1015
+ objPtr = Tcl_NewWideIntObj(argc - 1);
10161016
 Tcl_IncrRefCount(objPtr);
10171017
 resultObjPtr = Tcl_SetVar2Ex(pInterp, "argc", NULL, objPtr,
10181018
 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
10191019
 Tcl_DecrRefCount(objPtr); objPtr = 0;
10201020
 if( !resultObjPtr ){
@@ -1192,11 +1192,11 @@
11921192
 Tcl_CallWhenDeleted(tclInterp, Th1DeleteProc, interp);
11931193
 Tcl_CreateObjCommand(tclInterp, "th1Eval", Th1EvalObjCmd, interp, NULL);
11941194
 Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL);
11951195
 /* If necessary, evaluate the custom Tcl setup script. */
11961196
 setup = tclContext->setup;
1197
- if( setup && Tcl_Eval(tclInterp, setup)!=TCL_OK ){
1197
+ if( setup && Tcl_EvalEx(tclInterp, setup, -1, 0)!=TCL_OK ){
11981198
 Th_ErrorMessage(interp,
11991199
 "Tcl setup script error:", Tcl_GetStringResult(tclInterp), -1);
12001200
 Tcl_DeleteInterp(tclInterp);
12011201
 tclContext->interp = tclInterp = 0;
12021202
 return TH_ERROR;
12031203
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -98,11 +98,11 @@
98 # include <windows.h>
99 # ifndef TCL_DIRECTORY_SEP
100 # define TCL_DIRECTORY_SEP '\\'
101 # endif
102 # ifndef TCL_LIBRARY_NAME
103 # define TCL_LIBRARY_NAME "tcl86.dll\0"
104 # endif
105 # ifndef TCL_MINOR_OFFSET
106 # define TCL_MINOR_OFFSET (4)
107 # endif
108 # ifndef dlopen
@@ -119,32 +119,32 @@
119 # ifndef TCL_DIRECTORY_SEP
120 # define TCL_DIRECTORY_SEP '/'
121 # endif
122 # if defined(__CYGWIN__)
123 # ifndef TCL_LIBRARY_NAME
124 # define TCL_LIBRARY_NAME "libtcl8.6.dll\0"
125 # endif
126 # ifndef TCL_MINOR_OFFSET
127 # define TCL_MINOR_OFFSET (8)
128 # endif
129 # elif defined(__APPLE__)
130 # ifndef TCL_LIBRARY_NAME
131 # define TCL_LIBRARY_NAME "libtcl8.6.dylib\0"
132 # endif
133 # ifndef TCL_MINOR_OFFSET
134 # define TCL_MINOR_OFFSET (8)
135 # endif
136 # elif defined(__FreeBSD__)
137 # ifndef TCL_LIBRARY_NAME
138 # define TCL_LIBRARY_NAME "libtcl86.so\0"
139 # endif
140 # ifndef TCL_MINOR_OFFSET
141 # define TCL_MINOR_OFFSET (7)
142 # endif
143 # else
144 # ifndef TCL_LIBRARY_NAME
145 # define TCL_LIBRARY_NAME "libtcl8.6.so\0"
146 # endif
147 # ifndef TCL_MINOR_OFFSET
148 # define TCL_MINOR_OFFSET (8)
149 # endif
150 # endif /* defined(__CYGWIN__) */
@@ -972,11 +972,11 @@
972 return TH_OK;
973 }
974 } while( --aFileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */
975 aFileName[TCL_MINOR_OFFSET] = 'x';
976 Th_ErrorMessage(interp,
977 "could not load any supported Tcl 8.6, 8.5, or 8.4 shared library \"",
978 aFileName, -1);
979 return TH_ERROR;
980 #else
981 *phLibrary = 0;
982 *pxFindExecutable = Tcl_FindExecutable;
@@ -1010,11 +1010,11 @@
1010 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
1011 Tcl_DecrRefCount(objPtr); objPtr = 0;
1012 if( !resultObjPtr ){
1013 return TCL_ERROR;
1014 }
1015 objPtr = Tcl_NewIntObj(argc - 1);
1016 Tcl_IncrRefCount(objPtr);
1017 resultObjPtr = Tcl_SetVar2Ex(pInterp, "argc", NULL, objPtr,
1018 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
1019 Tcl_DecrRefCount(objPtr); objPtr = 0;
1020 if( !resultObjPtr ){
@@ -1192,11 +1192,11 @@
1192 Tcl_CallWhenDeleted(tclInterp, Th1DeleteProc, interp);
1193 Tcl_CreateObjCommand(tclInterp, "th1Eval", Th1EvalObjCmd, interp, NULL);
1194 Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL);
1195 /* If necessary, evaluate the custom Tcl setup script. */
1196 setup = tclContext->setup;
1197 if( setup && Tcl_Eval(tclInterp, setup)!=TCL_OK ){
1198 Th_ErrorMessage(interp,
1199 "Tcl setup script error:", Tcl_GetStringResult(tclInterp), -1);
1200 Tcl_DeleteInterp(tclInterp);
1201 tclContext->interp = tclInterp = 0;
1202 return TH_ERROR;
1203
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -98,11 +98,11 @@
98 # include <windows.h>
99 # ifndef TCL_DIRECTORY_SEP
100 # define TCL_DIRECTORY_SEP '\\'
101 # endif
102 # ifndef TCL_LIBRARY_NAME
103 # define TCL_LIBRARY_NAME "tcl87.dll\0"
104 # endif
105 # ifndef TCL_MINOR_OFFSET
106 # define TCL_MINOR_OFFSET (4)
107 # endif
108 # ifndef dlopen
@@ -119,32 +119,32 @@
119 # ifndef TCL_DIRECTORY_SEP
120 # define TCL_DIRECTORY_SEP '/'
121 # endif
122 # if defined(__CYGWIN__)
123 # ifndef TCL_LIBRARY_NAME
124 # define TCL_LIBRARY_NAME "libtcl8.7.dll\0"
125 # endif
126 # ifndef TCL_MINOR_OFFSET
127 # define TCL_MINOR_OFFSET (8)
128 # endif
129 # elif defined(__APPLE__)
130 # ifndef TCL_LIBRARY_NAME
131 # define TCL_LIBRARY_NAME "libtcl8.7.dylib\0"
132 # endif
133 # ifndef TCL_MINOR_OFFSET
134 # define TCL_MINOR_OFFSET (8)
135 # endif
136 # elif defined(__FreeBSD__)
137 # ifndef TCL_LIBRARY_NAME
138 # define TCL_LIBRARY_NAME "libtcl87.so\0"
139 # endif
140 # ifndef TCL_MINOR_OFFSET
141 # define TCL_MINOR_OFFSET (7)
142 # endif
143 # else
144 # ifndef TCL_LIBRARY_NAME
145 # define TCL_LIBRARY_NAME "libtcl8.7.so\0"
146 # endif
147 # ifndef TCL_MINOR_OFFSET
148 # define TCL_MINOR_OFFSET (8)
149 # endif
150 # endif /* defined(__CYGWIN__) */
@@ -972,11 +972,11 @@
972 return TH_OK;
973 }
974 } while( --aFileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */
975 aFileName[TCL_MINOR_OFFSET] = 'x';
976 Th_ErrorMessage(interp,
977 "could not load any supported Tcl 8.x shared library \"",
978 aFileName, -1);
979 return TH_ERROR;
980 #else
981 *phLibrary = 0;
982 *pxFindExecutable = Tcl_FindExecutable;
@@ -1010,11 +1010,11 @@
1010 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
1011 Tcl_DecrRefCount(objPtr); objPtr = 0;
1012 if( !resultObjPtr ){
1013 return TCL_ERROR;
1014 }
1015 objPtr = Tcl_NewWideIntObj(argc - 1);
1016 Tcl_IncrRefCount(objPtr);
1017 resultObjPtr = Tcl_SetVar2Ex(pInterp, "argc", NULL, objPtr,
1018 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
1019 Tcl_DecrRefCount(objPtr); objPtr = 0;
1020 if( !resultObjPtr ){
@@ -1192,11 +1192,11 @@
1192 Tcl_CallWhenDeleted(tclInterp, Th1DeleteProc, interp);
1193 Tcl_CreateObjCommand(tclInterp, "th1Eval", Th1EvalObjCmd, interp, NULL);
1194 Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL);
1195 /* If necessary, evaluate the custom Tcl setup script. */
1196 setup = tclContext->setup;
1197 if( setup && Tcl_EvalEx(tclInterp, setup, -1, 0)!=TCL_OK ){
1198 Th_ErrorMessage(interp,
1199 "Tcl setup script error:", Tcl_GetStringResult(tclInterp), -1);
1200 Tcl_DeleteInterp(tclInterp);
1201 tclContext->interp = tclInterp = 0;
1202 return TH_ERROR;
1203
M src/th_tcl.c
+8 -8
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -98,11 +98,11 @@
9898
 # include <windows.h>
9999
 # ifndef TCL_DIRECTORY_SEP
100100
 # define TCL_DIRECTORY_SEP '\\'
101101
 # endif
102102
 # ifndef TCL_LIBRARY_NAME
103
-# define TCL_LIBRARY_NAME "tcl86.dll\0"
103
+# define TCL_LIBRARY_NAME "tcl87.dll\0"
104104
 # endif
105105
 # ifndef TCL_MINOR_OFFSET
106106
 # define TCL_MINOR_OFFSET (4)
107107
 # endif
108108
 # ifndef dlopen
@@ -119,32 +119,32 @@
119119
 # ifndef TCL_DIRECTORY_SEP
120120
 # define TCL_DIRECTORY_SEP '/'
121121
 # endif
122122
 # if defined(__CYGWIN__)
123123
 # ifndef TCL_LIBRARY_NAME
124
-# define TCL_LIBRARY_NAME "libtcl8.6.dll\0"
124
+# define TCL_LIBRARY_NAME "libtcl8.7.dll\0"
125125
 # endif
126126
 # ifndef TCL_MINOR_OFFSET
127127
 # define TCL_MINOR_OFFSET (8)
128128
 # endif
129129
 # elif defined(__APPLE__)
130130
 # ifndef TCL_LIBRARY_NAME
131
-# define TCL_LIBRARY_NAME "libtcl8.6.dylib\0"
131
+# define TCL_LIBRARY_NAME "libtcl8.7.dylib\0"
132132
 # endif
133133
 # ifndef TCL_MINOR_OFFSET
134134
 # define TCL_MINOR_OFFSET (8)
135135
 # endif
136136
 # elif defined(__FreeBSD__)
137137
 # ifndef TCL_LIBRARY_NAME
138
-# define TCL_LIBRARY_NAME "libtcl86.so\0"
138
+# define TCL_LIBRARY_NAME "libtcl87.so\0"
139139
 # endif
140140
 # ifndef TCL_MINOR_OFFSET
141141
 # define TCL_MINOR_OFFSET (7)
142142
 # endif
143143
 # else
144144
 # ifndef TCL_LIBRARY_NAME
145
-# define TCL_LIBRARY_NAME "libtcl8.6.so\0"
145
+# define TCL_LIBRARY_NAME "libtcl8.7.so\0"
146146
 # endif
147147
 # ifndef TCL_MINOR_OFFSET
148148
 # define TCL_MINOR_OFFSET (8)
149149
 # endif
150150
 # endif /* defined(__CYGWIN__) */
@@ -972,11 +972,11 @@
972972
 return TH_OK;
973973
 }
974974
 } while( --aFileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */
975975
 aFileName[TCL_MINOR_OFFSET] = 'x';
976976
 Th_ErrorMessage(interp,
977
- "could not load any supported Tcl 8.6, 8.5, or 8.4 shared library \"",
977
+ "could not load any supported Tcl 8.x shared library \"",
978978
 aFileName, -1);
979979
 return TH_ERROR;
980980
 #else
981981
 *phLibrary = 0;
982982
 *pxFindExecutable = Tcl_FindExecutable;
@@ -1010,11 +1010,11 @@
10101010
 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
10111011
 Tcl_DecrRefCount(objPtr); objPtr = 0;
10121012
 if( !resultObjPtr ){
10131013
 return TCL_ERROR;
10141014
 }
1015
- objPtr = Tcl_NewIntObj(argc - 1);
1015
+ objPtr = Tcl_NewWideIntObj(argc - 1);
10161016
 Tcl_IncrRefCount(objPtr);
10171017
 resultObjPtr = Tcl_SetVar2Ex(pInterp, "argc", NULL, objPtr,
10181018
 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
10191019
 Tcl_DecrRefCount(objPtr); objPtr = 0;
10201020
 if( !resultObjPtr ){
@@ -1192,11 +1192,11 @@
11921192
 Tcl_CallWhenDeleted(tclInterp, Th1DeleteProc, interp);
11931193
 Tcl_CreateObjCommand(tclInterp, "th1Eval", Th1EvalObjCmd, interp, NULL);
11941194
 Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL);
11951195
 /* If necessary, evaluate the custom Tcl setup script. */
11961196
 setup = tclContext->setup;
1197
- if( setup && Tcl_Eval(tclInterp, setup)!=TCL_OK ){
1197
+ if( setup && Tcl_EvalEx(tclInterp, setup, -1, 0)!=TCL_OK ){
11981198
 Th_ErrorMessage(interp,
11991199
 "Tcl setup script error:", Tcl_GetStringResult(tclInterp), -1);
12001200
 Tcl_DeleteInterp(tclInterp);
12011201
 tclContext->interp = tclInterp = 0;
12021202
 return TH_ERROR;
12031203
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -98,11 +98,11 @@
98 # include <windows.h>
99 # ifndef TCL_DIRECTORY_SEP
100 # define TCL_DIRECTORY_SEP '\\'
101 # endif
102 # ifndef TCL_LIBRARY_NAME
103 # define TCL_LIBRARY_NAME "tcl86.dll\0"
104 # endif
105 # ifndef TCL_MINOR_OFFSET
106 # define TCL_MINOR_OFFSET (4)
107 # endif
108 # ifndef dlopen
@@ -119,32 +119,32 @@
119 # ifndef TCL_DIRECTORY_SEP
120 # define TCL_DIRECTORY_SEP '/'
121 # endif
122 # if defined(__CYGWIN__)
123 # ifndef TCL_LIBRARY_NAME
124 # define TCL_LIBRARY_NAME "libtcl8.6.dll\0"
125 # endif
126 # ifndef TCL_MINOR_OFFSET
127 # define TCL_MINOR_OFFSET (8)
128 # endif
129 # elif defined(__APPLE__)
130 # ifndef TCL_LIBRARY_NAME
131 # define TCL_LIBRARY_NAME "libtcl8.6.dylib\0"
132 # endif
133 # ifndef TCL_MINOR_OFFSET
134 # define TCL_MINOR_OFFSET (8)
135 # endif
136 # elif defined(__FreeBSD__)
137 # ifndef TCL_LIBRARY_NAME
138 # define TCL_LIBRARY_NAME "libtcl86.so\0"
139 # endif
140 # ifndef TCL_MINOR_OFFSET
141 # define TCL_MINOR_OFFSET (7)
142 # endif
143 # else
144 # ifndef TCL_LIBRARY_NAME
145 # define TCL_LIBRARY_NAME "libtcl8.6.so\0"
146 # endif
147 # ifndef TCL_MINOR_OFFSET
148 # define TCL_MINOR_OFFSET (8)
149 # endif
150 # endif /* defined(__CYGWIN__) */
@@ -972,11 +972,11 @@
972 return TH_OK;
973 }
974 } while( --aFileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */
975 aFileName[TCL_MINOR_OFFSET] = 'x';
976 Th_ErrorMessage(interp,
977 "could not load any supported Tcl 8.6, 8.5, or 8.4 shared library \"",
978 aFileName, -1);
979 return TH_ERROR;
980 #else
981 *phLibrary = 0;
982 *pxFindExecutable = Tcl_FindExecutable;
@@ -1010,11 +1010,11 @@
1010 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
1011 Tcl_DecrRefCount(objPtr); objPtr = 0;
1012 if( !resultObjPtr ){
1013 return TCL_ERROR;
1014 }
1015 objPtr = Tcl_NewIntObj(argc - 1);
1016 Tcl_IncrRefCount(objPtr);
1017 resultObjPtr = Tcl_SetVar2Ex(pInterp, "argc", NULL, objPtr,
1018 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
1019 Tcl_DecrRefCount(objPtr); objPtr = 0;
1020 if( !resultObjPtr ){
@@ -1192,11 +1192,11 @@
1192 Tcl_CallWhenDeleted(tclInterp, Th1DeleteProc, interp);
1193 Tcl_CreateObjCommand(tclInterp, "th1Eval", Th1EvalObjCmd, interp, NULL);
1194 Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL);
1195 /* If necessary, evaluate the custom Tcl setup script. */
1196 setup = tclContext->setup;
1197 if( setup && Tcl_Eval(tclInterp, setup)!=TCL_OK ){
1198 Th_ErrorMessage(interp,
1199 "Tcl setup script error:", Tcl_GetStringResult(tclInterp), -1);
1200 Tcl_DeleteInterp(tclInterp);
1201 tclContext->interp = tclInterp = 0;
1202 return TH_ERROR;
1203
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -98,11 +98,11 @@
98 # include <windows.h>
99 # ifndef TCL_DIRECTORY_SEP
100 # define TCL_DIRECTORY_SEP '\\'
101 # endif
102 # ifndef TCL_LIBRARY_NAME
103 # define TCL_LIBRARY_NAME "tcl87.dll\0"
104 # endif
105 # ifndef TCL_MINOR_OFFSET
106 # define TCL_MINOR_OFFSET (4)
107 # endif
108 # ifndef dlopen
@@ -119,32 +119,32 @@
119 # ifndef TCL_DIRECTORY_SEP
120 # define TCL_DIRECTORY_SEP '/'
121 # endif
122 # if defined(__CYGWIN__)
123 # ifndef TCL_LIBRARY_NAME
124 # define TCL_LIBRARY_NAME "libtcl8.7.dll\0"
125 # endif
126 # ifndef TCL_MINOR_OFFSET
127 # define TCL_MINOR_OFFSET (8)
128 # endif
129 # elif defined(__APPLE__)
130 # ifndef TCL_LIBRARY_NAME
131 # define TCL_LIBRARY_NAME "libtcl8.7.dylib\0"
132 # endif
133 # ifndef TCL_MINOR_OFFSET
134 # define TCL_MINOR_OFFSET (8)
135 # endif
136 # elif defined(__FreeBSD__)
137 # ifndef TCL_LIBRARY_NAME
138 # define TCL_LIBRARY_NAME "libtcl87.so\0"
139 # endif
140 # ifndef TCL_MINOR_OFFSET
141 # define TCL_MINOR_OFFSET (7)
142 # endif
143 # else
144 # ifndef TCL_LIBRARY_NAME
145 # define TCL_LIBRARY_NAME "libtcl8.7.so\0"
146 # endif
147 # ifndef TCL_MINOR_OFFSET
148 # define TCL_MINOR_OFFSET (8)
149 # endif
150 # endif /* defined(__CYGWIN__) */
@@ -972,11 +972,11 @@
972 return TH_OK;
973 }
974 } while( --aFileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */
975 aFileName[TCL_MINOR_OFFSET] = 'x';
976 Th_ErrorMessage(interp,
977 "could not load any supported Tcl 8.x shared library \"",
978 aFileName, -1);
979 return TH_ERROR;
980 #else
981 *phLibrary = 0;
982 *pxFindExecutable = Tcl_FindExecutable;
@@ -1010,11 +1010,11 @@
1010 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
1011 Tcl_DecrRefCount(objPtr); objPtr = 0;
1012 if( !resultObjPtr ){
1013 return TCL_ERROR;
1014 }
1015 objPtr = Tcl_NewWideIntObj(argc - 1);
1016 Tcl_IncrRefCount(objPtr);
1017 resultObjPtr = Tcl_SetVar2Ex(pInterp, "argc", NULL, objPtr,
1018 TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
1019 Tcl_DecrRefCount(objPtr); objPtr = 0;
1020 if( !resultObjPtr ){
@@ -1192,11 +1192,11 @@
1192 Tcl_CallWhenDeleted(tclInterp, Th1DeleteProc, interp);
1193 Tcl_CreateObjCommand(tclInterp, "th1Eval", Th1EvalObjCmd, interp, NULL);
1194 Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL);
1195 /* If necessary, evaluate the custom Tcl setup script. */
1196 setup = tclContext->setup;
1197 if( setup && Tcl_EvalEx(tclInterp, setup, -1, 0)!=TCL_OK ){
1198 Th_ErrorMessage(interp,
1199 "Tcl setup script error:", Tcl_GetStringResult(tclInterp), -1);
1200 Tcl_DeleteInterp(tclInterp);
1201 tclContext->interp = tclInterp = 0;
1202 return TH_ERROR;
1203

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button