diff options
| author | Andrew Haley <aph@redhat.com> | 2002-12-05 11:35:11 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2002-12-05 11:35:11 +0000 |
| commit | d8f2e87b7727707c23476f97224c5fd7756fab0a (patch) | |
| tree | beb9a681e04eb34ae7465e8012c20e90dbe09129 /libjava | |
| parent | 9148659d5825c5990c882b3d70c642d3159e4909 (diff) | |
| download | gcc-d8f2e87b7727707c23476f97224c5fd7756fab0a.zip gcc-d8f2e87b7727707c23476f97224c5fd7756fab0a.tar.gz gcc-d8f2e87b7727707c23476f97224c5fd7756fab0a.tar.bz2 | |
natStackTrace.cc (fillInStackTrace): Throw #ifdef (HAVE_BACKTRACE) around the whole function body.
2002-12-05 Andrew Haley <aph@redhat.com>
* gnu/gcj/runtime/natStackTrace.cc (fillInStackTrace): Throw
#ifdef (HAVE_BACKTRACE) around the whole function body.
From-SVN: r59855
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/natStackTrace.cc | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4f4a7e1..34125a3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-12-05 Andrew Haley <aph@redhat.com> + + * gnu/gcj/runtime/natStackTrace.cc (fillInStackTrace): Throw + #ifdef (HAVE_BACKTRACE) around the whole function body. + 2002-12-05 Tom Tromey <tromey@redhat.com> * java/lang/Class.h (_Jv_SetVTableEntries): Updated declaration. diff --git a/libjava/gnu/gcj/runtime/natStackTrace.cc b/libjava/gnu/gcj/runtime/natStackTrace.cc index 5cd89e3..e977f35 100644 --- a/libjava/gnu/gcj/runtime/natStackTrace.cc +++ b/libjava/gnu/gcj/runtime/natStackTrace.cc @@ -44,16 +44,15 @@ details. */ #include <unwind.h> -// Fill in this stack trace with N elements starting at offset. +// Fill in this stack trace with MAXLEN elements starting at offset. void gnu::gcj::runtime::StackTrace::fillInStackTrace (jint maxlen, jint offset) { -#if defined (HAVE_BACKTRACE) +#ifdef HAVE_BACKTRACE offset += 1; void *_p[maxlen + offset]; len = backtrace (_p, maxlen + offset) - offset; void **p = _p + offset; -#endif _Jv_frame_info *frame; if (len > 0) { @@ -86,6 +85,10 @@ gnu::gcj::runtime::StackTrace::fillInStackTrace (jint maxlen, jint offset) frame = NULL; addrs = reinterpret_cast<gnu::gcj::RawData *> (frame); +#else // HAVE_BACKTRACE + (void)maxlen; + (void)offset; +#endif // HAVE_BACKTRACE } /* Obtain the next power-of-2 of some integer. */ |