[beast: 14/15] BSE: remove extern "C" from plugin export symbols

[Tim Janik <timj src gnome org>]

commit 23ea7b41ffcab353f7ba0580bd8abaa0cdb0f194
Author: Tim Janik <timj gnu org>
Date:   Fri Oct 28 13:15:34 2016 +0200

    BSE: remove extern "C" from plugin export symbols
    
    Signed-off-by: Tim Janik <timj gnu org>

 bse/bsecxxplugin.hh |    1 -
 bse/bseplugin.hh    |    2 +-
 bse/bsetype.hh      |    6 +++---
 bse/mkcproc.pl      |    4 ++--
 bse/mktypes.pl      |    2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/bse/bsecxxplugin.hh b/bse/bsecxxplugin.hh
index 9620835..70eb8d4 100644
--- a/bse/bsecxxplugin.hh
+++ b/bse/bsecxxplugin.hh
@@ -28,7 +28,6 @@ const SfiInt  MAX_FINE_TUNE = BSE_MAX_FINE_TUNE;
 #else   /* BSE internal "Plugins" */
 #define BSE_CXX_DEFINE_EXPORTS()
 #define BSE_CXX_EXPORT_IDENTITY    &bse_builtin_export_identity
-extern "C" { extern ::BseExportIdentity bse_builtin_export_identity; /* sync with bseplugin.hh */ };
 #endif
 
 // == Resident Type Plugin Registration ==
diff --git a/bse/bseplugin.hh b/bse/bseplugin.hh
index 73e5846..2580e95 100644
--- a/bse/bseplugin.hh
+++ b/bse/bseplugin.hh
@@ -36,6 +36,6 @@ void            bse_plugin_make_resident        ();
 /* --- implementation details --- */
 void                    bse_plugin_init_builtins       (void);
 
-extern "C" { extern BseExportIdentity bse_builtin_export_identity; /* sync with bsecxxplugin.hh */ }
+extern BseExportIdentity bse_builtin_export_identity; /* sync with bsecxxplugin.hh */
 
 #endif /* __BSE_PLUGIN_H__ */
diff --git a/bse/bsetype.hh b/bse/bsetype.hh
index 8ff2462..6e88aa2 100644
--- a/bse/bsetype.hh
+++ b/bse/bsetype.hh
@@ -67,9 +67,9 @@ void         bse_type_uninit_boxed              (BseExportNodeBoxed *bnode);
 #define        BSE_TYPE_ID(BseTypeName)        (bse_type_builtin_id_##BseTypeName)
 #ifdef BSE_COMPILATION
 #  define BSE_BUILTIN_PROTO(BseTypeName) GType bse_type_builtin_register_##BseTypeName (void)
-#  define BSE_BUILTIN_TYPE(BseTypeName)         extern "C" BSE_BUILTIN_PROTO (BseTypeName); extern "C" 
BSE_BUILTIN_PROTO (BseTypeName)
-#  define BSE_DUMMY_TYPE(BseTypeName)   extern "C" BSE_BUILTIN_PROTO (BseTypeName); \
-                                         extern "C" BSE_BUILTIN_PROTO (BseTypeName) { return 0; }
+#  define BSE_BUILTIN_TYPE(BseTypeName)         BSE_BUILTIN_PROTO (BseTypeName); BSE_BUILTIN_PROTO 
(BseTypeName)
+#  define BSE_DUMMY_TYPE(BseTypeName)   BSE_BUILTIN_PROTO (BseTypeName); \
+                                         BSE_BUILTIN_PROTO (BseTypeName) { return 0; }
 #endif /* BSE_COMPILATION */
 
 
diff --git a/bse/mkcproc.pl b/bse/mkcproc.pl
index 64eba7d..c64afbb 100755
--- a/bse/mkcproc.pl
+++ b/bse/mkcproc.pl
@@ -35,7 +35,7 @@ sub func_name {
 
 if ($gen_externs) {
     for (@ARGV) {
-       print "extern \"C\" BseExportNode* ". func_name ($_) ." (void);\n";
+       print "BseExportNode* ". func_name ($_) ." (void);\n";
     }
     exit 0;
 } elsif ($gen_funcs) {
@@ -312,7 +312,7 @@ my $func = func_name ($file);
 if ($funcname) {
     $func = func_name ($funcname);
 }
-print "extern \"C\" BseExportNode* $func (void)\n{\n  return $last_node;\n}\n";
+print "BseExportNode* $func (void)\n{\n  return $last_node;\n}\n";
 
 
 print "\n/*\n * Generated data ends here\n */\n";
diff --git a/bse/mktypes.pl b/bse/mktypes.pl
index f6c864b..3aac013 100755
--- a/bse/mktypes.pl
+++ b/bse/mktypes.pl
@@ -161,7 +161,7 @@ while (<>) {
     }
 
     if ($gen_export_proto) {
-       print "extern \"C\" BSE_BUILTIN_PROTO ($type);\n";
+       print "BSE_BUILTIN_PROTO ($type);\n";
     }
     
     if ($gen_interns) {