projects
/
platform
/
upstream
/
nsjail.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a32eba
)
Conflicting enum types
author
Robert Swiecki
<swiecki@google.com>
Thu, 21 Jul 2016 13:34:46 +0000
(15:34 +0200)
committer
Robert Swiecki
<swiecki@google.com>
Thu, 21 Jul 2016 13:34:46 +0000
(15:34 +0200)
common.h
patch
|
blob
|
history
diff --git
a/common.h
b/common.h
index cc7e3961ea183f96631ab998b32802022d0aa667..de6364e3b6ee1cfb15aeea612c10aaf898c00178 100644
(file)
--- a/
common.h
+++ b/
common.h
@@
-74,7
+74,7
@@
struct fds_t {
TAILQ_ENTRY(fds_t) pointers;
};
-enum mode_t {
+enum
ns_
mode_t {
MODE_LISTEN_TCP = 0,
MODE_STANDALONE_ONCE,
MODE_STANDALONE_EXECVE,
@@
-113,7
+113,7
@@
struct nsjconf_t {
bool clone_newipc;
bool clone_newuts;
bool clone_newcgroup;
- enum mode_t mode;
+ enum
ns_
mode_t mode;
const char *chroot;
bool is_root_rw;
bool is_silent;