diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-20 23:30:46 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-20 23:30:46 +0000 |
| commit | 36143eef6be2ce9255998b5914b38194df6d169d (patch) | |
| tree | 88a48b421e4bd8ac7064e837896ccf0ff941907b /libjava/java/lang/Class.h | |
| parent | 21724bde63544ace635db468cf2a9dd3ca1ec106 (diff) | |
| download | ppe42-gcc-36143eef6be2ce9255998b5914b38194df6d169d.tar.gz ppe42-gcc-36143eef6be2ce9255998b5914b38194df6d169d.zip | |
2000-05-20 Bryce McKinlay <bryce@albatross.co.nz>
Fix for PR libgcj/226:
* java/lang/Class.h (_Jv_InitClass): Don't call __builtin_expect,
since this is an installed header.
Fix for PR libgcj/228:
* java/util/zip/ZipFile (getInputStream): Create inflater with
nowrapper option.
* java/util/zip/natInflater.cc (inflate): Throw zlib's error message
with DataFormatException.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34064 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang/Class.h')
| -rw-r--r-- | libjava/java/lang/Class.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index 03fa439b0b7..31f143ac577 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -206,8 +206,9 @@ private: inline friend void _Jv_InitClass (jclass klass) { - if (__builtin_expect (klass->state != JV_STATE_DONE, false)) - klass->initializeClass (); + if (klass->state == JV_STATE_DONE) + return; + klass->initializeClass (); } friend _Jv_Method* _Jv_LookupDeclaredMethod (jclass, _Jv_Utf8Const *, |
