X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpagealign_alloc.h;h=41fa5d5cf15b4bcb7c431052322598a4a7bc51fb;hb=f1fcb8539c9d1c7d9cefb25ce5c07a099ea1f148;hp=2d63eb15f21100f540eef3aacc9b035122db1b36;hpb=c49424557579cb46914ba4f080720d8b94abab39;p=gnulib.git

diff --git a/lib/pagealign_alloc.h b/lib/pagealign_alloc.h
index 2d63eb15f..41fa5d5cf 100644
--- a/lib/pagealign_alloc.h
+++ b/lib/pagealign_alloc.h
@@ -1,21 +1,19 @@
 /* Memory allocation aligned to system page boundaries.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _PAGEALIGN_ALLOC_H
 # define _PAGEALIGN_ALLOC_H
@@ -26,12 +24,25 @@
    boundary.
    If SIZE is not a multiple of the system page size, it will be rounded up
    to the next multiple.
-   Return a pointer to the start of the memory block, or NULL if the allocation
-   failed.  */
-extern void *pagealign_alloc (size_t size);
+   Return a pointer to the start of the memory block. Upon allocation failure,
+   return NULL and set errno.  */
+extern void *pagealign_alloc (size_t size)
+# if __GNUC__ >= 3
+     __attribute__ ((__malloc__))
+# endif
+     ;
+
+/* Like pagealign_alloc, except it exits the program if the allocation
+   fails.  */
+extern void *pagealign_xalloc (size_t size)
+# if __GNUC__ >= 3
+     __attribute__ ((__malloc__))
+# endif
+     ;
 
 /* Free a memory block.
-   PTR must be a pointer returned by pagealign_alloc.  */
+   PTR must be a non-NULL pointer returned by pagealign_alloc or
+   pagealign_xalloc.  */
 extern void pagealign_free (void *ptr);
 
 #endif /* _PAGEALIGN_ALLOC_H */