[ViewVC] Diff of: cvs/libeio/eio.c

Comparing libeio/eio.c (file contents):
Revision 1.59 by root, Wed Dec 1 07:30:39 2010 UTC vs.
Revision 1.60 by root, Fri Jan 7 21:45:42 2011 UTC

 # include <unistd.h>
 # include <utime.h>
 # include <signal.h>
 # include <dirent.h>
-#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES
+#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
 # include <sys/mman.h>
 #endif
 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
 # if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
   /* round up length */
   *length = (*length + mask) & ~mask;
 }
 #if !_POSIX_MEMLOCK
-# define eio__mlock(a,b) ((errno = ENOSYS), -1)
 # define eio__mlockall(a) ((errno = ENOSYS), -1)
 #else
-static int
-eio__mlock (void *addr, size_t length)
-{
-  eio_page_align (&addr, &length);
-  return mlock (addr, length);
-}
 static int
 eio__mlockall (int flags)
 {
   #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
          | (flags & EIO_MCL_FUTURE  ? MCL_FUTURE : 0);
     }
   return mlockall (flags);
 }
+#endif
+#if !_POSIX_MEMLOCK_RANGE
+# define eio__mlock(a,b) ((errno = ENOSYS), -1)
+#else
+static int
+eio__mlock (void *addr, size_t length)
+{
+  eio_page_align (&addr, &length);
+  return mlock (addr, length);
+}
 #endif
 #if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
 # define eio__msync(a,b,c) ((errno = ENOSYS), -1)
 #else

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines