diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-05-08 17:56:44 +0200 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-05-08 17:56:44 +0200 |
| commit | 3a0f903c9eee35af045b7c53d23df00dd75e0d56 (patch) | |
| tree | 04b1fa0a03f65c97eca98a0817ed2a2268c1a503 | |
| parent | a2e215abe628d95138749a4813575f8882c1efd0 (diff) | |
| download | oprofile-linaro_android_4.0.4.tar.gz | |
oprofile: Fix build in ISO C++11 modelinaro_android_4.0.4
Fixes macro constructs that can be confused with the new
string literals
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | opcontrol/opcontrol.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/opcontrol/opcontrol.cpp b/opcontrol/opcontrol.cpp index 075ade6..5442d2a 100644 --- a/opcontrol/opcontrol.cpp +++ b/opcontrol/opcontrol.cpp @@ -328,7 +328,7 @@ void setup_session_dir() fd = open(OP_DATA_DIR, O_RDONLY); if (fd != -1) { - system("rm -r "OP_DATA_DIR); + system("rm -r " OP_DATA_DIR); close(fd); } @@ -350,14 +350,14 @@ int do_setup() if (mkdir(OP_DRIVER_BASE, 0755)) { if (errno != EEXIST) { - fprintf(stderr, "Cannot create directory "OP_DRIVER_BASE": %s\n", + fprintf(stderr, "Cannot create directory " OP_DRIVER_BASE ": %s\n", strerror(errno)); return -1; } } if (access(OP_DRIVER_BASE"/stats", F_OK)) { - if (system("mount -t oprofilefs nodev "OP_DRIVER_BASE)) { + if (system("mount -t oprofilefs nodev " OP_DRIVER_BASE)) { return -1; } } @@ -563,7 +563,7 @@ void do_status() #if defined(__i386__) || defined(__x86_64__) /* FIXME on ARM - backtrace seems broken there */ - num = read_num(OP_DRIVER_BASE"/backtrace_depth"); + num = read_num(OP_DRIVER_BASE "/backtrace_depth"); printf(" %9u backtrace_depth\n", num); #endif } @@ -577,12 +577,12 @@ void do_reset() { int fd; - fd = open(OP_DATA_DIR"/samples/current", O_RDONLY); + fd = open(OP_DATA_DIR "/samples/current", O_RDONLY); if (fd == -1) { return; } close(fd); - system("rm -r "OP_DATA_DIR"/samples/current"); + system("rm -r " OP_DATA_DIR "/samples/current"); } int main(int argc, char * const argv[]) @@ -711,7 +711,7 @@ int main(int argc, char * const argv[]) strcpy(command, argv[0]); char* slash = strrchr(command, '/'); - strcpy(slash ? slash + 1 : command, "oprofiled --session-dir="OP_DATA_DIR); + strcpy(slash ? slash + 1 : command, "oprofiled --session-dir=" OP_DATA_DIR); #if defined(__i386__) || defined(__x86_64__) /* Nothing */ |