diff options
| author |  vis <vis@mailbox.org> | 2016-11-03 15:06:57 +0100 |
|---|---|---|
| committer | vis <vis@mailbox.org> | 2016-11-03 15:06:57 +0100 |
| commit | 2aafd9bd3a96b578bf423eb8faba0efe965c52d5 (patch) | |
| tree | 6ab4d26a6daad1e3972a86dbdcbe67030d710883 /src/include/common.h | |
| parent | Improvements for Zathura profile (diff) | |
| parent | removed warning if --quiet is enabled (diff) | |
| download | firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.tar.gz firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.tar.zst firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/include/common.h')
| -rw-r--r-- | src/include/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/common.h b/src/include/common.h index e28870807..f7c8ea725 100644 --- a/src/include/common.h +++ b/src/include/common.h | |||
| @@ -113,5 +113,5 @@ int join_namespace(pid_t pid, char *type); | |||
| 113 | int name2pid(const char *name, pid_t *pid); | 113 | int name2pid(const char *name, pid_t *pid); |
| 114 | char *pid_proc_comm(const pid_t pid); | 114 | char *pid_proc_comm(const pid_t pid); |
| 115 | char *pid_proc_cmdline(const pid_t pid); | 115 | char *pid_proc_cmdline(const pid_t pid); |
| 116 | int pid_proc_cmdline_x11(const pid_t pid); | 116 | int pid_proc_cmdline_x11_xpra_xephyr(const pid_t pid); |
| 117 | #endif | 117 | #endif |