diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-10-15 10:36:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-10-15 10:36:29 -0400 |
| commit | fa4a81518a92e8e414c3911e480cfcc2175cb6b6 (patch) | |
| tree | d11419bcf53c892546e0c1dee963fd6495073b7d | |
| parent | 4e5e93a74b01be4177a60889d4ea4713a98cb4ec (diff) | |
| parent | 50148dc45dc0e20abc5b63791ad3da417bf970bf (diff) | |
| download | tor-fa4a81518a92e8e414c3911e480cfcc2175cb6b6.tar.gz tor-fa4a81518a92e8e414c3911e480cfcc2175cb6b6.zip | |
Merge branch 'bug17347'
| -rw-r--r-- | changes/bug17347 | 4 | ||||
| -rw-r--r-- | src/common/sandbox.c | 2 | ||||
| -rw-r--r-- | src/common/sandbox.h | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug17347 b/changes/bug17347 new file mode 100644 index 0000000000..487b1320e2 --- /dev/null +++ b/changes/bug17347 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compilation of sandbox.c with musl-libc. + Fixes bug 17347; bugfix on 0.2.5.1-alpha. + Patch from 'jamestk'. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 161eab7aad..b995762738 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -48,7 +48,7 @@ #include <sys/epoll.h> #include <sys/prctl.h> #include <linux/futex.h> -#include <bits/signum.h> +#include <sys/file.h> #include <stdarg.h> #include <seccomp.h> diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 36d25d6516..21d517fe51 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -42,6 +42,9 @@ typedef struct sandbox_cfg_elem sandbox_cfg_t; #ifndef __USE_GNU #define __USE_GNU #endif +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include <sys/ucontext.h> #include <seccomp.h> #include <netdb.h> |