X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpagealign_alloc.c;h=6c2043ccb66dc6bb3082765a5a2538a938350df2;hb=4ad44dd748d5da39555cdf305568280d69a23354;hp=45bbd65732d8c42f52a94f526f9569f75348a8b1;hpb=15a8db51a45e0e0fb7777c12ce983dcb29da245a;p=gnulib.git

diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index 45bbd6573..6c2043ccb 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, 2007 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
@@ -19,9 +19,7 @@
 
 /* Written by Derek R. Price <derek@ximbiot.com>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "pagealign_alloc.h"
 
@@ -36,7 +34,6 @@
 #endif
 
 #include "error.h"
-#include "exit.h"
 #include "getpagesize.h"
 #include "xalloc.h"
 #include "gettext.h"
@@ -54,6 +51,11 @@
 # 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
 
@@ -83,7 +85,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;