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

diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index 531bd6a56..c06dd0da4 100644
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -1,6 +1,6 @@
 /* Memory allocation aligned to system page boundaries.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -14,27 +14,20 @@
 
    You should have received a copy of the GNU General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Written by Derek R. Price <derek@ximbiot.com>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "pagealign_alloc.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <fcntl.h>
+#include <unistd.h>
 
 #if HAVE_MMAP
 # include <sys/mman.h>
@@ -48,6 +41,22 @@
 
 #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
+
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
+
 
 #if HAVE_MMAP || ! HAVE_POSIX_MEMALIGN
 
@@ -77,7 +86,7 @@ static memnode_t *memnode_table = NULL;
 static void
 new_memnode (void *aligned_ptr, info_t info)
 {
-  memnode_t *new_node = (memnode_t *) xmalloc (sizeof (memnode_t));
+  memnode_t *new_node = XMALLOC (memnode_t);
   new_node->aligned_ptr = aligned_ptr;
   new_node->info = info;
   new_node->next = memnode_table;
@@ -149,7 +158,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);