This is an automated email from the ASF dual-hosted git repository.

mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git


The following commit(s) were added to refs/heads/master by this push:
     new 99042a0  Support for Tcl8.6 by conditional definition of Tcl_Size
99042a0 is described below

commit 99042a0079137071bb03ca60b9320dffcd312107
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Tue Aug 19 16:55:34 2025 +0200

    Support for Tcl8.6 by conditional definition of Tcl_Size
---
 ChangeLog                       | 9 +++++++--
 src/mod_rivet_ng/rivet_types.h  | 5 +++++
 src/parser/rivetParser.c        | 4 ++--
 tests/apachetest/apachetest.tcl | 6 +++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4462b72..bb58d5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2025-08-19 Massimo Manghi <mxman...@apache.org>
+       * src/mod_rivet_ng/rivet_types.h,src/parser/rivetParser.c: Introducting 
definition
+       of Tcl_Size when TCL_MAJOR_VERSION == 8 in order to provide backward 
compatibility
+       with Tcl 8 builds
+
 2025-07-13 Massimo Manghi <mxman...@apache.org>
-    * rivet/packages/dio/dio_Tdbc.tcl: fixed error in variable name made 
impossible
-    to actually pass TDBC specific options to a DBMS connector. Package 
version is bumped as 1.2.1
+       * rivet/packages/dio/dio_Tdbc.tcl: fixed error in variable name made 
impossible
+       to actually pass TDBC specific options to a DBMS connector. Package 
version is bumped to 1.2.1
 
 2025-05-05 Massimo Manghi <mxman...@apache.org>
        * VERSION: Version 3.3.0. Merging tcl-novem into master after branching 
current
diff --git a/src/mod_rivet_ng/rivet_types.h b/src/mod_rivet_ng/rivet_types.h
index 8aebea0..6c84aab 100644
--- a/src/mod_rivet_ng/rivet_types.h
+++ b/src/mod_rivet_ng/rivet_types.h
@@ -27,6 +27,11 @@
 #include <httpd.h>
 #include <tcl.h>
 
+#if TCL_MAJOR_VERSION == 8
+#define Tcl_Size int
+#endif
+
+
 /* Definition suggested in
  *
  * 
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Particular-Headers.html
diff --git a/src/parser/rivetParser.c b/src/parser/rivetParser.c
index 2eed107..5d350f5 100644
--- a/src/parser/rivetParser.c
+++ b/src/parser/rivetParser.c
@@ -21,8 +21,6 @@
    limitations under the License.
 */
 
-/* $Id$ */
-
 /* Rivet config */
 #ifdef HAVE_CONFIG_H
 #include <rivet_config.h>
@@ -37,6 +35,8 @@
 #   undef EXTERN
 #   define EXTERN
 #endif /* EXTERN */
+
+#include "rivet.h"
 #include "rivetParser.h"
 
 int Rivet_Parser(Tcl_Obj *outbuf, Tcl_Obj *inbuf);
diff --git a/tests/apachetest/apachetest.tcl b/tests/apachetest/apachetest.tcl
index 3549b23..f612d0f 100644
--- a/tests/apachetest/apachetest.tcl
+++ b/tests/apachetest/apachetest.tcl
@@ -327,9 +327,9 @@ proc apachetest::getallincludes { conffile } {
            }
            append data $newdata
            return $data
-   } else {
-       return
-   }
+    } else {
+        return
+    }
 }
 
 # apachetest::getloadmodules --


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org

Reply via email to