From 6b61b9573985890223c2f8b330fb83b0e5914419 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 25 Sep 2006 18:28:11 +0000 Subject: [PATCH] mprec.c (mprec_calloc): Renamed. * native/fdlibm/mprec.c (mprec_calloc): Renamed. (Balloc): Updated. From-SVN: r117204 --- libjava/classpath/ChangeLog.gcj | 5 +++++ libjava/classpath/native/fdlibm/mprec.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 11d0132fc99..3503a07edf7 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,8 @@ +2006-09-25 Tom Tromey + + * native/fdlibm/mprec.c (mprec_calloc): Renamed. + (Balloc): Updated. + 2006-09-25 Mark Wielaard Suggested by Aaron M. Ucko diff --git a/libjava/classpath/native/fdlibm/mprec.c b/libjava/classpath/native/fdlibm/mprec.c index 31e09ddaae9..8a7cdc03968 100644 --- a/libjava/classpath/native/fdlibm/mprec.c +++ b/libjava/classpath/native/fdlibm/mprec.c @@ -101,7 +101,7 @@ typedef unsigned long __ULong; typedef long __Long; static void * -_calloc_r (void *ignore, size_t x1, size_t x2) +mprec_calloc (void *ignore, size_t x1, size_t x2) { char *result = (char *) malloc (x1 * x2); memset (result, 0, x1 * x2); @@ -119,7 +119,7 @@ _DEFUN (Balloc, (ptr, k), struct _reent *ptr _AND int k) if (_REENT_MP_FREELIST(ptr) == NULL) { /* Allocate a list of pointers to the mprec objects */ - _REENT_MP_FREELIST(ptr) = (struct _Bigint **) _calloc_r (ptr, + _REENT_MP_FREELIST(ptr) = (struct _Bigint **) mprec_calloc (ptr, sizeof (struct _Bigint *), new_k); if (_REENT_MP_FREELIST(ptr) == NULL) @@ -150,7 +150,7 @@ _DEFUN (Balloc, (ptr, k), struct _reent *ptr _AND int k) { x = 1 << k; /* Allocate an mprec Bigint and stick in in the freelist */ - rv = (_Bigint *) _calloc_r (ptr, + rv = (_Bigint *) mprec_calloc (ptr, 1, sizeof (_Bigint) + (x-1) * sizeof(rv->_x)); -- 2.30.2