2 files changed, 9 insertions, 3 deletions
diff --git a/libbuild2/test/init.cxx b/libbuild2/test/init.cxx
index 3d13acc..a5afea0 100644
--- a/libbuild2/test/init.cxx
+++ b/libbuild2/test/init.cxx
@@ -220,12 +220,18 @@ namespace build2
       return true;
     }
 
-    module_functions
+    static const module_functions mod_functions[] =
+    {
+      {"test",  &boot,   &init},
+      {nullptr, nullptr, nullptr}
+    };
+
+    const module_functions*
     build2_test_load ()
     {
       script::regex::init ();
 
-      return module_functions {&boot, &init};
+      return mod_functions;
     }
   }
 }
diff --git a/libbuild2/test/init.hxx b/libbuild2/test/init.hxx
index a76b720..57f6bfa 100644
--- a/libbuild2/test/init.hxx
+++ b/libbuild2/test/init.hxx
@@ -28,7 +28,7 @@ namespace build2
           bool,
           const variable_map&);
 
-    extern "C" LIBBUILD2_SYMEXPORT module_functions
+    extern "C" LIBBUILD2_SYMEXPORT const module_functions*
     build2_test_load ();
   }
 }