branch master updated: * tp/Texinfo/XS/convert/ConvertXS.xs (init), tp/Texinfo/XS/main/build_perl_info.c (init), tp/Texinfo/XS/parsetexi/Parsetexi.xs (init), tp/Texinfo/XSLoader.pm (init): pass more ModulePath paths to init functions called by XSLoader.pm when initializing XS modules.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new ffa1ac8c57 * tp/Texinfo/XS/convert/ConvertXS.xs (init), 
tp/Texinfo/XS/main/build_perl_info.c (init), 
tp/Texinfo/XS/parsetexi/Parsetexi.xs (init), tp/Texinfo/XSLoader.pm (init): 
pass more ModulePath paths to init functions called by XSLoader.pm when 
initializing XS modules.
ffa1ac8c57 is described below

commit ffa1ac8c57c88adfeaecf7e2626733be993d59f9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jul 22 21:30:30 2024 +0200

    * tp/Texinfo/XS/convert/ConvertXS.xs (init),
    tp/Texinfo/XS/main/build_perl_info.c (init),
    tp/Texinfo/XS/parsetexi/Parsetexi.xs (init), tp/Texinfo/XSLoader.pm
    (init): pass more ModulePath paths to init functions called by
    XSLoader.pm when initializing XS modules.
---
 ChangeLog                            | 8 ++++++++
 tp/Texinfo/XS/convert/ConvertXS.xs   | 9 +++++----
 tp/Texinfo/XS/main/build_perl_info.c | 3 ++-
 tp/Texinfo/XS/main/build_perl_info.h | 3 ++-
 tp/Texinfo/XS/parsetexi/Parsetexi.xs | 5 +++--
 tp/Texinfo/XSLoader.pm               | 4 +++-
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ac0954f51..160dc9c0bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,14 @@
        * tp/Texinfo/XS/XSParagraph.xs, tp/Texinfo/XS/xspara.c: remove
        xspara_init, as it does nothing.
 
+2024-07-22  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/ConvertXS.xs (init),
+       tp/Texinfo/XS/main/build_perl_info.c (init),
+       tp/Texinfo/XS/parsetexi/Parsetexi.xs (init), tp/Texinfo/XSLoader.pm
+       (init): pass more ModulePath paths to init functions called by
+       XSLoader.pm when initializing XS modules.
+
 2024-07-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.am (test_files): fix file name.
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index eca83df139..de73d15470 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -65,11 +65,12 @@ MODULE = Texinfo::Convert::ConvertXS        PACKAGE = 
Texinfo::Convert::ConvertXS
 PROTOTYPES: ENABLE
 
 # Called from Texinfo::XSLoader.pm.
-#        int texinfo_uninstalled
-# File path, can be in any encoding
-#        const char *tp_builddir = (const char *)SvPVbyte_nolen($arg);
+# File paths can be in any encoding
 int
-init (...)
+init (int texinfo_uninstalled, tp_builddir, pkgdatadir, top_srcdir)
+     const char *tp_builddir = (const char *)SvPVbyte_nolen ($arg);
+     const char *pkgdatadir = (const char *)SvPVbyte_nolen ($arg);
+     const char *top_srcdir = (const char *)SvPVbyte_nolen ($arg);
       CODE:
         set_element_type_name_info ();
         converter_setup ();
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index 8b6f5b4b1d..c609a628a5 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -131,7 +131,8 @@ perl_only_strndup (const char *s, size_t n)
 }
 
 int
-init (int texinfo_uninstalled, const char *builddir)
+init (int texinfo_uninstalled, const char *builddir,
+      const char *pkgdatadir, const char *top_srcdir)
 {
 #ifdef ENABLE_NLS
 
diff --git a/tp/Texinfo/XS/main/build_perl_info.h 
b/tp/Texinfo/XS/main/build_perl_info.h
index c05abafa15..0524ae04d2 100644
--- a/tp/Texinfo/XS/main/build_perl_info.h
+++ b/tp/Texinfo/XS/main/build_perl_info.h
@@ -20,7 +20,8 @@ void *perl_only_malloc (size_t size);
 char *perl_only_strdup (const char *s);
 char *perl_only_strndup (const char *s, size_t n);
 
-int init (int texinfo_uninstalled, const char *tp_builddir);
+int init (int texinfo_uninstalled, const char *tp_builddir,
+          const char *pkgdatadir, const char *top_srcdir);
 
 /* in options_get_perl.c */
 SV *build_sv_option (const OPTIONS *options, const char *key,
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.xs 
b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
index 443d06b6e8..dc24b4e960 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
@@ -57,9 +57,10 @@ PROTOTYPES: ENABLE
 # Called from Texinfo::XSLoader.pm.  The arguments are not actually used.
 # file path, can be in any encoding
 int
-init (texinfo_uninstalled, tp_builddir)
-     int texinfo_uninstalled
+init (int texinfo_uninstalled, tp_builddir, pkgdatadir, top_srcdir)
      const char *tp_builddir = (const char *)SvPVbyte_nolen ($arg);
+     const char *pkgdatadir = (const char *)SvPVbyte_nolen ($arg);
+     const char *top_srcdir = (const char *)SvPVbyte_nolen ($arg);
 
 void
 reset_parser (int debug_output)
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 8cf630588c..f88c18bdb6 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -215,7 +215,9 @@ sub init {
 
   if (defined &{"${module}::init"}
       and !&{"${module}::init"} ($Texinfo::ModulePath::texinfo_uninstalled,
-                                 $Texinfo::ModulePath::tp_builddir)) {
+                                 $Texinfo::ModulePath::tp_builddir,
+                                 $Texinfo::ModulePath::pkgdatadir,
+                                 $Texinfo::ModulePath::top_srcdir)) {
     _fatal "$module_name: error initializing";
     goto FALLBACK;
   }