Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f979197

Browse files
committed
Add support for Tcl 9
Tcl 9 changed several API functions to take Tcl_Size, which is ptrdiff_t, instead of int, for 64-bit enablement. We have to change a few local variables to be compatible with that. We also provide a fallback typedef of Tcl_Size for older Tcl versions. The affected variables are used for quantities that will not approach values beyond the range of int, so this doesn't change any functionality. Reviewed-by: Tristan Partin <tristan@partin.io> Discussion: https://www.postgresql.org/message-id/flat/bce0fe54-75b4-438e-b42b-8e84bc7c0e9c%40eisentraut.org
1 parent 0813a5e commit f979197

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/pl/tcl/pltcl.c

+10-6
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ PG_MODULE_MAGIC;
5656
#define CONST86
5757
#endif
5858

59+
#if !HAVE_TCL_VERSION(8,7)
60+
typedef int Tcl_Size;
61+
#endif
62+
5963
/* define our text domain for translations */
6064
#undef TEXTDOMAIN
6165
#define TEXTDOMAIN PG_TEXTDOMAIN("pltcl")
@@ -987,7 +991,7 @@ pltcl_func_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
987991
HeapTuple tup;
988992
Tcl_Obj *resultObj;
989993
Tcl_Obj **resultObjv;
990-
int resultObjc;
994+
Tcl_Size resultObjc;
991995

992996
/*
993997
* Set up data about result type. XXX it's tempting to consider
@@ -1063,7 +1067,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
10631067
int tcl_rc;
10641068
int i;
10651069
const char *result;
1066-
int result_Objc;
1070+
Tcl_Size result_Objc;
10671071
Tcl_Obj **result_Objv;
10681072
int rc PG_USED_FOR_ASSERTS_ONLY;
10691073

@@ -2008,7 +2012,7 @@ pltcl_quote(ClientData cdata, Tcl_Interp *interp,
20082012
char *tmp;
20092013
const char *cp1;
20102014
char *cp2;
2011-
int length;
2015+
Tcl_Size length;
20122016

20132017
/************************************************************
20142018
* Check call syntax
@@ -2202,7 +2206,7 @@ pltcl_returnnext(ClientData cdata, Tcl_Interp *interp,
22022206
if (prodesc->fn_retistuple)
22032207
{
22042208
Tcl_Obj **rowObjv;
2205-
int rowObjc;
2209+
Tcl_Size rowObjc;
22062210

22072211
/* result should be a list, so break it down */
22082212
if (Tcl_ListObjGetElements(interp, objv[1], &rowObjc, &rowObjv) == TCL_ERROR)
@@ -2544,7 +2548,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp,
25442548
int objc, Tcl_Obj *const objv[])
25452549
{
25462550
volatile MemoryContext plan_cxt = NULL;
2547-
int nargs;
2551+
Tcl_Size nargs;
25482552
Tcl_Obj **argsObj;
25492553
pltcl_query_desc *qdesc;
25502554
int i;
@@ -2682,7 +2686,7 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
26822686
const char *arrayname = NULL;
26832687
Tcl_Obj *loop_body = NULL;
26842688
int count = 0;
2685-
int callObjc;
2689+
Tcl_Size callObjc;
26862690
Tcl_Obj **callObjv = NULL;
26872691
Datum *argvalues;
26882692
MemoryContext oldcontext = CurrentMemoryContext;

0 commit comments

Comments
 (0)