From 39b079c66644d717e0a7983d3325410dd05152b2 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 19 Jun 2015 11:01:10 +0200
Subject: [PATCH 1/1] [mc] Remove some extern "C"

clang was complaining about C-linkage functions with non-C-linkage return/parameter types.
---
 src/mc/mc_dwarf.cpp       | 4 ----
 src/mc/mc_location.h      | 2 --
 src/mc/mc_member.cpp      | 4 ----
 src/mc/mc_object_info.cpp | 4 ----
 src/mc/mc_object_info.h   | 5 +----
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index c81b34fb12..3bedffac20 100644
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -18,8 +18,6 @@
 #include "mc_object_info.h"
 #include "mc_private.h"
 
-extern "C" {
-
 static void MC_dwarf_register_global_variable(mc_object_info_t info, dw_variable_t variable);
 static void MC_register_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable);
 static void MC_dwarf_register_non_global_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable);
@@ -1433,5 +1431,3 @@ void MC_post_process_object_info(mc_process_t process, mc_object_info_t info)
 
   }
 }
-
-}
diff --git a/src/mc/mc_location.h b/src/mc/mc_location.h
index 3dd7308746..a3b3bb5841 100644
--- a/src/mc/mc_location.h
+++ b/src/mc/mc_location.h
@@ -16,8 +16,6 @@
 #include <simgrid_config.h>
 #include "mc_base.h"
 #include "mc_forward.h"
-#include "mc_object_info.h"
-#include "mc_forward.h"
 #include "AddressSpace.hpp"
 
 SG_BEGIN_DECL()
diff --git a/src/mc/mc_member.cpp b/src/mc/mc_member.cpp
index a75a9afdb5..21eaf1468b 100644
--- a/src/mc/mc_member.cpp
+++ b/src/mc/mc_member.cpp
@@ -9,8 +9,6 @@
 #include "mc_object_info.h"
 #include "mc_private.h"
 
-extern "C" {
-
 /** Resolve snapshot in the process address space
  *
  * @param object   Process address of the struct/class
@@ -43,5 +41,3 @@ void *mc_member_resolve(const void *base, dw_type_t type, dw_type_t member,
   else
     return (void *) state.stack[state.stack_size - 1];
 }
-
-}
diff --git a/src/mc/mc_object_info.cpp b/src/mc/mc_object_info.cpp
index 95f9e2a952..2b00607c68 100644
--- a/src/mc/mc_object_info.cpp
+++ b/src/mc/mc_object_info.cpp
@@ -11,8 +11,6 @@
 #include "mc_object_info.h"
 #include "mc_private.h"
 
-extern "C" {
-
 dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *ip)
 {
   xbt_dynar_t dynar = info->functions_index;
@@ -44,5 +42,3 @@ dw_variable_t MC_file_object_info_find_variable_by_name(mc_object_info_t info, c
 
   return NULL;
 }
-
-}
diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h
index cf0b742a5c..9dbf036ae8 100644
--- a/src/mc/mc_object_info.h
+++ b/src/mc/mc_object_info.h
@@ -23,8 +23,6 @@
 #include "mc_process.h"
 #include "../smpi/private.h"
 
-SG_BEGIN_DECL();
-
 // ***** Type
 
 typedef int e_dw_type_type;
@@ -117,6 +115,7 @@ XBT_INTERNAL void* MC_object_base_address(mc_object_info_t info);
 
 XBT_INTERNAL std::shared_ptr<s_mc_object_info_t> MC_find_object_info(
   std::vector<simgrid::mc::VmMap> const& maps, const char* name, int executable);
+
 XBT_INTERNAL void MC_free_object_info(mc_object_info_t* p);
 
 XBT_INTERNAL dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *ip);
@@ -170,6 +169,4 @@ struct s_mc_function_index_item {
 
 XBT_INTERNAL void mc_frame_free(dw_frame_t freme);
 
-SG_END_DECL()
-
 #endif
-- 
2.20.1