From 6af47bf89759b4c547c1d2e98e7a5abae39d759f Mon Sep 17 00:00:00 2001 From: David Smith Date: Wed, 20 Mar 2013 15:51:37 -0500 Subject: [PATCH] Include runtime/dyninst/stapdyn.h properly in stapdyn C++ code. * stapdyn/dynprobe.cxx: Make sure when we include runtime/dyninst/stapdyn.h we use 'extern "C"'. * stapdyn/mutatee.cxx: Ditto. * stapdyn/mutator.cxx: Ditto. * stapdyn/mutator.h: Ditto. --- stapdyn/dynprobe.cxx | 2 ++ stapdyn/mutatee.cxx | 2 ++ stapdyn/mutator.cxx | 3 ++- stapdyn/mutator.h | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stapdyn/dynprobe.cxx b/stapdyn/dynprobe.cxx index e22137b60..225ec1067 100644 --- a/stapdyn/dynprobe.cxx +++ b/stapdyn/dynprobe.cxx @@ -10,7 +10,9 @@ #include "dynutil.h" #include "../util.h" +extern "C" { #include "../runtime/dyninst/stapdyn.h" +} using namespace std; diff --git a/stapdyn/mutatee.cxx b/stapdyn/mutatee.cxx index 40e84fb46..2dfb96330 100644 --- a/stapdyn/mutatee.cxx +++ b/stapdyn/mutatee.cxx @@ -22,7 +22,9 @@ extern "C" { #include "dynutil.h" #include "../util.h" +extern "C" { #include "../runtime/dyninst/stapdyn.h" +} using namespace std; diff --git a/stapdyn/mutator.cxx b/stapdyn/mutator.cxx index 09f6dfb1d..079aefb64 100644 --- a/stapdyn/mutator.cxx +++ b/stapdyn/mutator.cxx @@ -21,8 +21,9 @@ extern "C" { #include "dynutil.h" #include "../util.h" +extern "C" { #include "../runtime/dyninst/stapdyn.h" - +} using namespace std; diff --git a/stapdyn/mutator.h b/stapdyn/mutator.h index 470e4df18..ff8290685 100644 --- a/stapdyn/mutator.h +++ b/stapdyn/mutator.h @@ -22,7 +22,9 @@ #include "dynprobe.h" #include "dynutil.h" #include "mutatee.h" +extern "C" { #include "../runtime/dyninst/stapdyn.h" +} // The mutator drives all instrumentation. -- 2.43.5