2 files changed, 11 insertions, 5 deletions
diff --git a/libbuild2/config/init.cxx b/libbuild2/config/init.cxx
index 73275c6..b790569 100644
--- a/libbuild2/config/init.cxx
+++ b/libbuild2/config/init.cxx
@@ -145,15 +145,21 @@ namespace build2
       return true;
     }
 
-    module_functions
+    static const module_functions mod_functions[] =
+    {
+      {"config", &boot,   &init},
+      {nullptr,  nullptr, nullptr}
+    };
+
+    const module_functions*
     build2_config_load ()
     {
       // Initialize the config entry points in the build system core.
       //
-      config_save_variable = &config::save_variable;
-      config_preprocess_create = &config::preprocess_create;
+      config_save_variable = &save_variable;
+      config_preprocess_create = &preprocess_create;
 
-      return module_functions {&boot, &init};
+      return mod_functions;
     }
   }
 }
diff --git a/libbuild2/config/init.hxx b/libbuild2/config/init.hxx
index ff5e923..f900801 100644
--- a/libbuild2/config/init.hxx
+++ b/libbuild2/config/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_config_load ();
   }
 }