diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2000-05-20 23:30:46 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-05-21 00:30:46 +0100 |
| commit | 1c02a3d9640482c8e296f4f939381fde52fd9b18 (patch) | |
| tree | 88a48b421e4bd8ac7064e837896ccf0ff941907b /libjava/java/lang/Class.h | |
| parent | dcfa721dcfd39c314d5dd8c3877c8ad6c79c5a24 (diff) | |
| download | gcc-1c02a3d9640482c8e296f4f939381fde52fd9b18.zip gcc-1c02a3d9640482c8e296f4f939381fde52fd9b18.tar.gz gcc-1c02a3d9640482c8e296f4f939381fde52fd9b18.tar.bz2 | |
re GNATS libgcj/226 (implicit __builtin_expect) and GNATS gcj/228 (compressed JAR files)
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.
From-SVN: r34064
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 03fa439..31f143a 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 *, |