[tor-commits] [tor/master] Fix compilation of sandbox.[ch] under musl-libc

[nickm@xxxxxxxxxxxxxx]

commit 50148dc45dc0e20abc5b63791ad3da417bf970bf
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 15 10:35:45 2015 -0400

    Fix compilation of sandbox.[ch] under musl-libc
    
    Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347.
---
 changes/bug17347     |    4 ++++
 src/common/sandbox.c |    2 +-
 src/common/sandbox.h |    3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug17347 b/changes/bug17347
new file mode 100644
index 0000000..487b132
--- /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 161eab7..b995762 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 36d25d6..21d517f 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>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits