diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-01-28 23:41:24 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-01-28 23:41:24 +0000 |
| commit | 5817b9bf96b898283cc29f0834ef0712ad49c073 (patch) | |
| tree | 98b2d9120142d5cc95e98d013aca28e6918d128f /java/jdk16/files/patch-j2se::pack::defines.h | |
| parent | Add zlib to plist if FreeBSD < 5.0 (diff) | |
. Link with the system libz instead of building the our own internal
copy. This should have the following effects:
. Fix problems experienced by programmes that dynamically create their
own copy of the JVM and are linked against the system's zlib (e.g.,
eclipse).
. Reduce the potential for zlib based security problems affecting the
JDK.
Submitted by: mi@
Diffstat (limited to 'java/jdk16/files/patch-j2se::pack::defines.h')
| -rw-r--r-- | java/jdk16/files/patch-j2se::pack::defines.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-j2se::pack::defines.h b/java/jdk16/files/patch-j2se::pack::defines.h new file mode 100644 index 000000000000..5c97841af76b --- /dev/null +++ b/java/jdk16/files/patch-j2se::pack::defines.h @@ -0,0 +1,24 @@ +--- ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h Tue Oct 19 14:59:48 2004 ++++ ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h Sun Oct 16 09:06:04 2005 +@@ -15,4 +15,8 @@ + #endif + ++#ifndef NO_ZLIB ++# include <zconf.h> ++#endif ++ + #ifndef FULL + #define FULL 1 /* Adds <500 bytes to the zipped final product. */ +@@ -70,4 +74,5 @@ + + typedef unsigned int uint; ++#ifdef NO_ZLIB + #ifdef _LP64 + typedef unsigned int uLong; // Historical zlib, should be 32-bit. +@@ -75,4 +80,6 @@ + typedef unsigned long uLong; + #endif ++#endif ++ + #ifdef _MSC_VER + typedef LONGLONG jlong; |