summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-01-08 13:23:33 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-01-08 13:23:33 (GMT)
commit7c8d31cc87f2f5fdee6d0cde0a74bfdd9f89af84 (patch)
treea29e8694305305848309e867181c9feeb6d25a33
parent3c68325bf7466e9a841a48d7fb17cedc75fa172f (diff)
parent8f67aa69c15fe66d42a1b26c75653e9ca2fb49ad (diff)
downloadtcl-7c8d31cc87f2f5fdee6d0cde0a74bfdd9f89af84.zip
tcl-7c8d31cc87f2f5fdee6d0cde0a74bfdd9f89af84.tar.gz
tcl-7c8d31cc87f2f5fdee6d0cde0a74bfdd9f89af84.tar.bz2
Merge 8.6. Add (back) special Tcl_GetLongFromObj handling for Cygwin64 stub-table
-rw-r--r--generic/tclStubInit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 97f37b0..e45efc8 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -553,6 +553,7 @@ Tcl_WinTCharToUtf(
* signature. Tcl 9 must find a better solution, but that cannot be done
* without introducing a binary incompatibility.
*/
+#define Tcl_GetLongFromObj (int(*)(Tcl_Interp*,Tcl_Obj*,long*))(void *)Tcl_GetIntFromObj
static int exprInt(Tcl_Interp *interp, const char *expr, int *ptr){
long longValue;
int result = Tcl_ExprLong(interp, expr, &longValue);
@@ -568,7 +569,7 @@ static int exprInt(Tcl_Interp *interp, const char *expr, int *ptr){
}
return result;
}
-#define Tcl_ExprLong (int(*)(Tcl_Interp*,const char*,long*))exprInt
+#define Tcl_ExprLong (int(*)(Tcl_Interp*,const char*,long*))(void *)exprInt
static int exprIntObj(Tcl_Interp *interp, Tcl_Obj*expr, int *ptr){
long longValue;
int result = Tcl_ExprLongObj(interp, expr, &longValue);
@@ -584,7 +585,7 @@ static int exprIntObj(Tcl_Interp *interp, Tcl_Obj*expr, int *ptr){
}
return result;
}
-#define Tcl_ExprLongObj (int(*)(Tcl_Interp*,Tcl_Obj*,long*))exprIntObj
+#define Tcl_ExprLongObj (int(*)(Tcl_Interp*,Tcl_Obj*,long*))(void *)exprIntObj
static int utfNcmp(const char *s1, const char *s2, unsigned int n){
return Tcl_UtfNcmp(s1, s2, (unsigned long)n);
}