projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lib/userspec.c (parse_with_separator): If a user or group string
[gnulib.git]
/
lib
/
pagealign_alloc.c
diff --git
a/lib/pagealign_alloc.c
b/lib/pagealign_alloc.c
index
bc9a301
..
c06dd0d
100644
(file)
--- a/
lib/pagealign_alloc.c
+++ b/
lib/pagealign_alloc.c
@@
-1,6
+1,6
@@
/* Memory allocation aligned to system page boundaries.
/* 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
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
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
,
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
,
USA. */
/* Written by Derek R. Price <derek@ximbiot.com>. */
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>
#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>
#if HAVE_MMAP
# include <sys/mman.h>
@@
-59,6
+52,11
@@
# endif
#endif
# 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
#if HAVE_MMAP || ! HAVE_POSIX_MEMALIGN
@@
-88,7
+86,7
@@
static memnode_t *memnode_table = NULL;
static void
new_memnode (void *aligned_ptr, info_t info)
{
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;
new_node->aligned_ptr = aligned_ptr;
new_node->info = info;
new_node->next = memnode_table;