X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fpagealign_alloc.c;h=75513004547fd678241b13186e262a46727c1b2a;hb=26c5fd742f9136e2ddbd4695a9172c3fa30ea260;hp=cbbe76346e8860dddaeaabb1968a051aa7639ba1;hpb=7c6d5072278ec9af612e21f0507a009ed37816e1;p=gnulib.git
diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index cbbe76346..755130045 100644
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -1,21 +1,19 @@
/* Memory allocation aligned to system page boundaries.
- Copyright (C) 2005, 2006 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
- by the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
/* Written by Derek R. Price . */
@@ -34,8 +32,6 @@
#endif
#include "error.h"
-#include "exit.h"
-#include "getpagesize.h"
#include "xalloc.h"
#include "gettext.h"
@@ -52,6 +48,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