procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re GNATS libgcj/226 (implicit __builtin_expect) and GNATS gcj/228 (compressed JAR files)

Browse source 
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
This commit is contained in:
Bryce McKinlay 2000-05-20 23:30:46 +00:00 • committed by Bryce McKinlay
parent dcfa721dcf
commit 1c02a3d964
4 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libjava/java/util/zip/ZipFile.java
View file

@ -133,7 +133,9 @@ public class ZipFile implements ZipConstants
InputStream is = new ByteArrayInputStream (buffer);
if (ze.getMethod() == ZipEntry.DEFLATED)
is = new InflaterInputStream (is);
// Data in zipfile entries does not have a zlib header, so construct
// an Inflater with the `nowrapper' option.
is = new InflaterInputStream (is, new Inflater (true), 512);
return is;
}