From 34cc74df52ed129bffeb7b6fcf11f05c222550ba Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 27 Jun 2016 15:27:14 +0200
Subject: Get rid of extern "C" in module boot()/init()

We will have a separate (extern "C") register() function that will return
the pointers to these two. This way we can still throw exceptions from
boot() and init().
---
 build2/dist/module     | 20 ++++++++++----------
 build2/dist/module.cxx | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'build2/dist')

diff --git a/build2/dist/module b/build2/dist/module
index 984a969..3c43c1f 100644
--- a/build2/dist/module
+++ b/build2/dist/module
@@ -14,17 +14,17 @@ namespace build2
 {
   namespace dist
   {
-    extern "C" void
-    dist_boot (scope&, const location&, unique_ptr<module_base>&);
+    void
+    boot (scope&, const location&, unique_ptr<module_base>&);
 
-    extern "C" bool
-    dist_init (scope&,
-               scope&,
-               const location&,
-               unique_ptr<module_base>&,
-               bool,
-               bool,
-               const variable_map&);
+    bool
+    init (scope&,
+          scope&,
+          const location&,
+          unique_ptr<module_base>&,
+          bool,
+          bool,
+          const variable_map&);
   }
 }
 
diff --git a/build2/dist/module.cxx b/build2/dist/module.cxx
index 58bfc6f..eed9562 100644
--- a/build2/dist/module.cxx
+++ b/build2/dist/module.cxx
@@ -22,8 +22,8 @@ namespace build2
   {
     static rule rule_;
 
-    extern "C" void
-    dist_boot (scope& r, const location&, unique_ptr<module_base>&)
+    void
+    boot (scope& r, const location&, unique_ptr<module_base>&)
     {
       tracer trace ("dist::boot");
 
@@ -54,14 +54,14 @@ namespace build2
       }
     }
 
-    extern "C" bool
-    dist_init (scope& r,
-               scope&,
-               const location& l,
-               unique_ptr<module_base>&,
-               bool first,
-               bool,
-               const variable_map& config_hints)
+    bool
+    init (scope& r,
+          scope&,
+          const location& l,
+          unique_ptr<module_base>&,
+          bool first,
+          bool,
+          const variable_map& config_hints)
     {
       tracer trace ("dist::init");
 
-- 
cgit v1.1