From 36143eef6be2ce9255998b5914b38194df6d169d Mon Sep 17 00:00:00 2001 From: bryce Date: Sat, 20 May 2000 23:30:46 +0000 Subject: 2000-05-20 Bryce McKinlay 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 --- libjava/java/lang/Class.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libjava/java/lang/Class.h') 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 *, -- cgit v1.2.3