nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug17347'

Browse Source
This commit is contained in:
Nick Mathewson 2015-10-15 10:36:29 -04:00
commit fa4a81518a
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug17347 Normal file
View File

@ -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'.

2
src/common/sandbox.c
View File

@ -48,7 +48,7 @@
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <linux/futex.h> #include <linux/futex.h>
#include <bits/signum.h> #include <sys/file.h>
#include <stdarg.h> #include <stdarg.h>
#include <seccomp.h> #include <seccomp.h>

3
src/common/sandbox.h
View File

@ -42,6 +42,9 @@ typedef struct sandbox_cfg_elem sandbox_cfg_t;
#ifndef __USE_GNU #ifndef __USE_GNU
#define __USE_GNU #define __USE_GNU
#endif #endif
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <sys/ucontext.h> #include <sys/ucontext.h>
#include <seccomp.h> #include <seccomp.h>
#include <netdb.h> #include <netdb.h>