Minor fixes

diff --git a/config.cc b/config.cc
index 50a82a9e4774ee4c90a6e7d23a1010e04113b2b2..df73e4c2f978227365ce838b7477a398b7ea9f44 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -48,7 +48,7 @@ extern "C" {
 
 #define DUP_IF_SET(njc, val) (njc.has_##val() ? njc.val().c_str() : NULL)
 
-static __rlim64_t configRLimit(
+static uint64_t configRLimit(
     int res, const nsjail::RLimit& rl, const uint64_t val, unsigned long mul = 1UL) {
        if (rl == nsjail::RLimit::VALUE) {
                return (val * mul);

diff --git a/nsjail.h b/nsjail.h
index 038e58c52ead4d8ddbb73428af64bf1f5ec2548a..dcb327c35ee541ae071d1a13cdf4522ec8c52c5e 100644 (file)
--- a/nsjail.h
+++ b/nsjail.h
@@ -23,6 +23,17 @@
 #ifndef NS_NSJAIL_H
 #define NS_NSJAIL_H
 
+//taken from https://github.com/openhome/ohNet/issues/25
+#define _GNU_SOURCE 1
+#if defined(PLATFORM_MACOSX_GNU) || defined(PLATFORM_FREEBSD) || !defined(__GLIBC__)
+#define TEMP_FAILURE_RETRY(expression) \
+  (__extension__                                                              \
+    ({ long int __result;                                                     \
+       do __result = (long int) (expression);                                 \
+       while (__result == -1L && errno == EINTR);                             \
+       __result; }))
+#endif
+
 #include <netinet/ip6.h>
 #include <signal.h>
 #include <stdbool.h>

diff --git a/util.c b/util.c
index 8c3a6389f5d1f89ce67bc30f1bdd714cf1dadf65..9cabecd0af4446c11e5aa414256b1ac62410708e 100644 (file)
--- a/util.c
+++ b/util.c
@@ -288,8 +288,8 @@ const char* utilSigName(int signo) {
                }
        }
 
-       if (signo > __SIGRTMIN) {
-               snprintf(sigstr, sizeof(sigstr), "SIG%d-RTMIN+%d", signo, signo - __SIGRTMIN);
+       if (signo > SIGRTMIN) {
+               snprintf(sigstr, sizeof(sigstr), "SIG%d-RTMIN+%d", signo, signo - SIGRTMIN);
                return sigstr;
        }
        snprintf(sigstr, sizeof(sigstr), "UNKNOWN-%d", signo);