diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4adaf585aab8a6e552544b3d6216e9ed6229ad0a..bc3d8d8a43e1f28a28f068f1a5350f632a66d3cc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-08-21 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + PR libgcj/23507 + * stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Fix typo in newLength + assignment. Cast operands of compare to function pointer type. + 2005-08-21 Tom Tromey <tromey@redhat.com> * HACKING: Updated for hacking classpath in libgcj. diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc index e02767888353b0d984a99e2330fa645c6ec84b59..bc1935f1a75f159185092febe7914480d4252fb3 100644 --- a/libjava/stacktrace.cc +++ b/libjava/stacktrace.cc @@ -102,7 +102,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr) // Check if the trace buffer needs to be extended. if (pos == state->length) { - int newLength = state->length *= 2; + int newLength = state->length * 2; void *newFrames = _Jv_AllocBytes (newLength * sizeof(_Jv_StackFrame)); memcpy (newFrames, state->frames, state->length * sizeof(_Jv_StackFrame)); state->frames = (_Jv_StackFrame *) newFrames; @@ -117,7 +117,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr) // correspondance between call frames in the interpreted stack and occurances // of _Jv_InterpMethod::run() on the native stack. #ifdef INTERPRETER - if (func_addr == (_Unwind_Ptr) &_Jv_InterpMethod::run) + if ((void (*)(void)) func_addr == (void (*)(void)) &_Jv_InterpMethod::run) { state->frames[pos].type = frame_interpreter; state->frames[pos].interp.meth = state->interp_frame->self;