From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 29 Sep 2000 03:39:20 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/libc-2_1_95~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f091f00a06a15454add413504e4855db24ab44a2;p=platform%2Fupstream%2Fglibc.git

Update.

2000-09-19  H.J. Lu  <hjl@gnu.org>

	* malloc/malloc.h (__memalign_hook): Fix the parameter order.
	* malloc/malloc.c (__memalign_hook): Likewise.
	(memalign_hook_ini): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 0f4efab..e895596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-19  H.J. Lu  <hjl@gnu.org>
+
+	* malloc/malloc.h (__memalign_hook): Fix the parameter order.
+	* malloc/malloc.c (__memalign_hook): Likewise.
+	(memalign_hook_ini): Likewise.
+
 2000-09-28  Ulrich Drepper  <drepper@redhat.com>
 
 	* stdio-common/tmpnam.c (tmpnam): Optimize a bit.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 9a8a087..2eb9c55 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1772,15 +1772,15 @@ realloc_hook_ini(ptr, sz, caller)
 
 static Void_t*
 #if __STD_C
-memalign_hook_ini(size_t sz, size_t alignment, const __malloc_ptr_t caller)
+memalign_hook_ini(size_t alignment, size_t sz, const __malloc_ptr_t caller)
 #else
-memalign_hook_ini(sz, alignment, caller)
-     size_t sz; size_t alignment; const __malloc_ptr_t caller;
+memalign_hook_ini(alignment, sz, caller)
+     size_t alignment; size_t sz; const __malloc_ptr_t caller;
 #endif
 {
   __memalign_hook = NULL;
   ptmalloc_init();
-  return mEMALIGn(sz, alignment);
+  return mEMALIGn(alignment, sz);
 }
 
 void weak_variable (*__malloc_initialize_hook) __MALLOC_P ((void)) = NULL;
@@ -1792,7 +1792,7 @@ __malloc_ptr_t weak_variable (*__realloc_hook)
  __MALLOC_P ((__malloc_ptr_t __ptr, size_t __size, const __malloc_ptr_t))
      = realloc_hook_ini;
 __malloc_ptr_t weak_variable (*__memalign_hook)
- __MALLOC_P ((size_t __size, size_t __alignment, const __malloc_ptr_t))
+ __MALLOC_P ((size_t __alignment, size_t __size, const __malloc_ptr_t))
      = memalign_hook_ini;
 void weak_variable (*__after_morecore_hook) __MALLOC_P ((void)) = NULL;
 
diff --git a/malloc/malloc.h b/malloc/malloc.h
index af908c1..decf61c 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -225,8 +225,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));