X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpagealign_alloc.c;h=bc9a301588db4405486d2c1494af727e7974cfe4;hb=4f5d6947d90a65c2b577ef2ca7adf4e413cfe6b6;hp=531bd6a56f4f6b6fa49af08e19b63db4e7bbf755;hpb=534f92e85132b32dab5327c3dfe11e95c0b05e0a;p=gnulib.git

diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index 531bd6a56..bc9a30158 100644
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -48,6 +48,17 @@
 
 #define _(str) gettext (str)
 
+#if HAVE_MMAP
+/* Define MAP_FILE when it isn't otherwise.  */
+# ifndef MAP_FILE
+#  define MAP_FILE 0
+# endif
+/* Define MAP_FAILED for old systems which neglect to.  */
+# ifndef MAP_FAILED
+#  define MAP_FAILED ((void *)-1)
+# endif
+#endif
+
 
 #if HAVE_MMAP || ! HAVE_POSIX_MEMALIGN
 
@@ -149,7 +160,12 @@ pagealign_alloc (size_t size)
   size_t pagesize = getpagesize ();
   void *unaligned_ptr = malloc (size + pagesize - 1);
   if (unaligned_ptr == NULL)
-    return NULL;
+    {
+      /* Set errno.  We don't know whether malloc already set errno: some
+	 implementations of malloc do, some don't.  */
+      errno = ENOMEM;
+      return NULL;
+    }
   ret = (char *) unaligned_ptr
         + ((- (unsigned long) unaligned_ptr) & (pagesize - 1));
   new_memnode (ret, unaligned_ptr);