Update.

[platform/upstream/glibc.git] / malloc / malloc.h

diff --git a/malloc/malloc.h b/malloc/malloc.h
index 78deff0..270642e 100644 (file)
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -1,5 +1,5 @@
 /* Prototypes and definition for malloc implementation.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -55,7 +55,7 @@
 /* Used by GNU libc internals. */
 # define __malloc_size_t size_t
 # define __malloc_ptrdiff_t ptrdiff_t
-#else
+#elif !defined __attribute_malloc__
 # define __attribute_malloc__
 #endif
 
@@ -76,6 +76,8 @@
 
 #else  /* Not GCC.  */
 
+# define __THROW
+
 # if (defined __STDC__ && __STDC__) || defined __cplusplus
 
 #  define __MALLOC_P(args)     args
@@ -147,8 +149,7 @@ extern __malloc_ptr_t  pvalloc __MALLOC_P ((size_t __size))
 
 /* Underlying allocation function; successive calls should return
    contiguous pieces of memory.  */
-extern __malloc_ptr_t (*__morecore) __MALLOC_PMT ((ptrdiff_t __size))
-       __attribute_malloc__;
+extern __malloc_ptr_t (*__morecore) __MALLOC_PMT ((ptrdiff_t __size));
 
 /* Default value of `__morecore'.  */
 extern __malloc_ptr_t __default_morecore __MALLOC_P ((ptrdiff_t __size))
@@ -226,8 +227,8 @@ extern __malloc_ptr_t (*__malloc_hook) __MALLOC_PMT ((size_t __size,
 extern __malloc_ptr_t (*__realloc_hook) __MALLOC_PMT ((__malloc_ptr_t __ptr,
                                                     size_t __size,
                                                     __const __malloc_ptr_t));
-extern __malloc_ptr_t (*__memalign_hook) __MALLOC_PMT ((size_t __size,
-                                                     size_t __alignment,
+extern __malloc_ptr_t (*__memalign_hook) __MALLOC_PMT ((size_t __alignment,
+                                                     size_t __size,
                                                      __const __malloc_ptr_t));
 extern void (*__after_morecore_hook) __MALLOC_PMT ((void));