From 83bb02cada0b894d9134cc5489999e0f0fe8bd7c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 8 Jul 2019 14:55:35 +0200
Subject: Move in build system module to separate library

---
 libbuild2/dist/init.cxx | 10 ++++++++--
 libbuild2/dist/init.hxx |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'libbuild2/dist')

diff --git a/libbuild2/dist/init.cxx b/libbuild2/dist/init.cxx
index 959b2dd..4729938 100644
--- a/libbuild2/dist/init.cxx
+++ b/libbuild2/dist/init.cxx
@@ -183,10 +183,16 @@ namespace build2
       return true;
     }
 
-    module_functions
+    static const module_functions mod_functions[] =
+    {
+      {"dist",  &boot,   &init},
+      {nullptr, nullptr, nullptr}
+    };
+
+    const module_functions*
     build2_dist_load ()
     {
-      return module_functions {&boot, &init};
+      return mod_functions;
     }
   }
 }
diff --git a/libbuild2/dist/init.hxx b/libbuild2/dist/init.hxx
index 41c82a7..cfcb3af 100644
--- a/libbuild2/dist/init.hxx
+++ b/libbuild2/dist/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_dist_load ();
   }
 }
-- 
cgit v1.1