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/bin/module     | 16 ++++++++--------
 build2/bin/module.cxx | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'build2/bin')

diff --git a/build2/bin/module b/build2/bin/module
index 0b9d44e..e74cbe2 100644
--- a/build2/bin/module
+++ b/build2/bin/module
@@ -14,14 +14,14 @@ namespace build2
 {
   namespace bin
   {
-    extern "C" bool
-    bin_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/bin/module.cxx b/build2/bin/module.cxx
index d5df054..70a2b98 100644
--- a/build2/bin/module.cxx
+++ b/build2/bin/module.cxx
@@ -30,14 +30,14 @@ namespace build2
     static const strings liba_lib {"static"};
     static const strings libso_lib {"shared"};
 
-    extern "C" bool
-    bin_init (scope& r,
-              scope& b,
-              const location&,
-              unique_ptr<module_base>&,
-              bool first,
-              bool,
-              const variable_map& config_hints)
+    bool
+    init (scope& r,
+          scope& b,
+          const location&,
+          unique_ptr<module_base>&,
+          bool first,
+          bool,
+          const variable_map& config_hints)
     {
       tracer trace ("bin::init");
       l5 ([&]{trace << "for " << b.out_path ();});
-- 
cgit v1.1