aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/classpath/ChangeLog.gcj5
-rw-r--r--libjava/classpath/native/fdlibm/mprec.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 11d0132..3503a07 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,8 @@
+2006-09-25 Tom Tromey <tromey@redhat.com>
+
+ * native/fdlibm/mprec.c (mprec_calloc): Renamed.
+ (Balloc): Updated.
+
2006-09-25 Mark Wielaard <mark@klomp.org>
Suggested by Aaron M. Ucko <ucko@debian.org>
diff --git a/libjava/classpath/native/fdlibm/mprec.c b/libjava/classpath/native/fdlibm/mprec.c
index 31e09dd..8a7cdc0 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));