replaced CONST84 with CONST86 which is supported by Tcl 8.7
diff --git a/ChangeLog b/ChangeLog
index fce7278..ee9ca31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-01-09 Massimo Manghi <mxmanghi@apache.org>
+ * src/mod_rivet_ng/TclWebapache.c:
+ * src/mod_rivet_ng/rivetChannel.c:
+ * src/mod_rivet_ng/rivetCore.c: Replaced CONST84 with CONST86 that should
+ allow for a smooth transition to Tcl8.7
+
2022-11-05 Massimo Manghi <mxmanghi@apache.org>
* VERSION: new version 3.2.3
* src/*.[hc]: Thoroughly removed trailing spaces
diff --git a/src/mod_rivet_ng/TclWebapache.c b/src/mod_rivet_ng/TclWebapache.c
index ea95973..b9191f1 100644
--- a/src/mod_rivet_ng/TclWebapache.c
+++ b/src/mod_rivet_ng/TclWebapache.c
@@ -207,7 +207,7 @@
/* Print nice HTML formatted errors */
int
-TclWeb_PrintError(CONST84 char *errstr, int htmlflag, TclWebRequest *req)
+TclWeb_PrintError(CONST86 char *errstr, int htmlflag, TclWebRequest *req)
{
TclWeb_SetHeaderType(DEFAULT_HEADER_TYPE, req);
TclWeb_PrintHeaders(req);
diff --git a/src/mod_rivet_ng/rivetChannel.c b/src/mod_rivet_ng/rivetChannel.c
index 8b55236..0b3b854 100644
--- a/src/mod_rivet_ng/rivetChannel.c
+++ b/src/mod_rivet_ng/rivetChannel.c
@@ -49,7 +49,7 @@
Channel that we create to divert stdout to. */
static int
-outputproc(ClientData instancedata, CONST84 char *buf, int toWrite, int *errorCodePtr)
+outputproc(ClientData instancedata, CONST86 char *buf, int toWrite, int *errorCodePtr)
{
apr_threadkey_t* rivet_thread_key = (apr_threadkey_t*) instancedata;
rivet_thread_private* private;
@@ -74,7 +74,7 @@
static int
setoptionproc(ClientData instancedata, Tcl_Interp *interp,
- CONST84 char *optionname, CONST84 char *value)
+ CONST86 char *optionname, CONST86 char *value)
{
return TCL_OK;
}
diff --git a/src/mod_rivet_ng/rivetCore.c b/src/mod_rivet_ng/rivetCore.c
index 147dfc8..09a9d86 100644
--- a/src/mod_rivet_ng/rivetCore.c
+++ b/src/mod_rivet_ng/rivetCore.c
@@ -886,7 +886,7 @@
apr_table_t *table = NULL;
int subcommandindex;
- static CONST84 char *SubCommand[] = {
+ static CONST86 char *SubCommand[] = {
"get",
"set",
"exists",
@@ -907,7 +907,7 @@
SUB_CLEAR
};
- static CONST84 char *tableNames[] = {
+ static CONST86 char *tableNames[] = {
"notes",
"headers_in",
"headers_out",
@@ -1132,7 +1132,7 @@
* of an upload
*/
- static CONST84 char *SubCommand[] = {
+ static CONST86 char *SubCommand[] = {
"channel",
"save",
"data",
@@ -1157,7 +1157,7 @@
NAMES
};
- static CONST84 int cmds_objc[] = { 3,4,3,3,3,3,3,3,2 };
+ static CONST86 int cmds_objc[] = { 3,4,3,3,3,3,3,3,2 };
int expected_objc;
rivet_thread_private* private;
@@ -1774,7 +1774,7 @@
int loglevelindex;
int apLogLevel = 0;
- static CONST84 char *logLevel[] = {
+ static CONST86 char *logLevel[] = {
"emerg",
"alert",
"crit",
