Commit e5a2ecf3 authored by Kirill Smelkov's avatar Kirill Smelkov

Merge remote-tracking branch 'kirr/t' into t

* kirr/t:
  X Fix mlock2 build on Debian 8
parents 124688f9 c2423296
...@@ -33,12 +33,17 @@ cdef extern from *: ...@@ -33,12 +33,17 @@ cdef extern from *:
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h> #include <sys/syscall.h>
static int mlock2(const void *addr, size_t len, int flags) { static int mlock2(const void *addr, size_t len, int flags) {
#ifndef SYS_mlock2
errno = ENOSYS;
return -1;
#else
long err = syscall(SYS_mlock2, addr, len, flags); long err = syscall(SYS_mlock2, addr, len, flags);
if (err != 0) { if (err != 0) {
errno = -err; errno = -err;
return -1; return -1;
} }
return 0; return 0;
#endif
} }
#endif #endif
#endif #endif
...@@ -62,7 +67,7 @@ cpdef enum: ...@@ -62,7 +67,7 @@ cpdef enum:
MLOCK_ONFAULT = mman.MLOCK_ONFAULT MLOCK_ONFAULT = mman.MLOCK_ONFAULT
MCL_CURRENT = mman.MCL_CURRENT MCL_CURRENT = mman.MCL_CURRENT
MCL_FUTURE = mman.MCL_FUTURE MCL_FUTURE = mman.MCL_FUTURE
MCL_ONFAULT = mman.MCL_ONFAULT #MCL_ONFAULT = mman.MCL_ONFAULT
MADV_NORMAL = mman.MADV_NORMAL MADV_NORMAL = mman.MADV_NORMAL
MADV_RANDOM = mman.MADV_RANDOM MADV_RANDOM = mman.MADV_RANDOM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment