summaryrefslogtreecommitdiffstats
path: root/sandbox/linux
diff options
context:
space:
mode:
authormarkus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 00:06:17 +0000
committermarkus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 00:06:17 +0000
commit8fde5835996d55cf731526a45d4d85fb5a51e997 (patch)
tree0fb093e05e1e8315b18c04daceb0d59dfb5ae8e4 /sandbox/linux
parent0b99ae575f39da34f7494723934d2a8cfeca63a8 (diff)
downloadchromium_src-8fde5835996d55cf731526a45d4d85fb5a51e997.zip
chromium_src-8fde5835996d55cf731526a45d4d85fb5a51e997.tar.gz
chromium_src-8fde5835996d55cf731526a45d4d85fb5a51e997.tar.bz2
SVN was apparently quite confused by all the changes that we made during the code review of the initial changelist. And it ended up putting the checked-in files into a different directory than on my local disk. Oops.
Instead of renaming the directory, which has the potential to break more things, this changelist just fixes the include paths. The directory name isn't quite ideal, but it is not really that bad either. Just some confusion between hyphens and underscores. BUG=130662 TEST=build with Makefile Review URL: https://chromiumcodereview.appspot.com/10532015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/linux')
-rw-r--r--sandbox/linux/seccomp-bpf/demo.cc4
-rw-r--r--sandbox/linux/seccomp-bpf/sandbox_bpf.cc2
-rw-r--r--sandbox/linux/seccomp-bpf/util.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/sandbox/linux/seccomp-bpf/demo.cc b/sandbox/linux/seccomp-bpf/demo.cc
index 5fb0d1ac..ceff9d4 100644
--- a/sandbox/linux/seccomp-bpf/demo.cc
+++ b/sandbox/linux/seccomp-bpf/demo.cc
@@ -25,8 +25,8 @@
#include <time.h>
#include <unistd.h>
-#include "sandbox/linux/seccomp_bpf/sandbox_bpf.h"
-#include "sandbox/linux/seccomp_bpf/util.h"
+#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
+#include "sandbox/linux/seccomp-bpf/util.h"
#define ERR EPERM
diff --git a/sandbox/linux/seccomp-bpf/sandbox_bpf.cc b/sandbox/linux/seccomp-bpf/sandbox_bpf.cc
index f4b6ea0..a60b208 100644
--- a/sandbox/linux/seccomp-bpf/sandbox_bpf.cc
+++ b/sandbox/linux/seccomp-bpf/sandbox_bpf.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sandbox/linux/seccomp_bpf/sandbox_bpf.h"
+#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
// The kernel gives us a sandbox, we turn it into a playground :-)
// This is version 2 of the playground; version 1 was built on top of
diff --git a/sandbox/linux/seccomp-bpf/util.cc b/sandbox/linux/seccomp-bpf/util.cc
index 6a94591..dea3f5a 100644
--- a/sandbox/linux/seccomp-bpf/util.cc
+++ b/sandbox/linux/seccomp-bpf/util.cc
@@ -12,8 +12,8 @@
#include <sys/types.h>
#include <unistd.h>
-#include "sandbox/linux/seccomp_bpf/sandbox_bpf.h"
-#include "sandbox/linux/seccomp_bpf/util.h"
+#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
+#include "sandbox/linux/seccomp-bpf/util.h"
namespace playground2 {