changeset 3058:78bbe8fce2d4

Merge
author chegar
date Mon, 11 Oct 2010 10:55:04 +0100
parents a50828844ccc f0888585b6ff
children b444f86c4abe 7f4006dec750
files
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/io/package.html	Fri Oct 08 11:28:49 2010 +0100
+++ b/src/share/classes/java/io/package.html	Mon Oct 11 10:55:04 2010 +0100
@@ -44,7 +44,7 @@
 For overviews, tutorials, examples, guides, and tool documentation,
 please see:
 <ul>
-  <li><a href="../../../guide/serialization">Serialization Enhancements</a>
+  <li><a href="../../../technotes/guides/serialization">Serialization Enhancements</a>
 </ul>
 
 @since JDK1.0
--- a/src/share/native/java/util/zip/Inflater.c	Fri Oct 08 11:28:49 2010 +0100
+++ b/src/share/native/java/util/zip/Inflater.c	Mon Oct 11 10:55:04 2010 +0100
@@ -38,6 +38,8 @@
 #include "zlib.h"
 #include "java_util_zip_Inflater.h"
 
+#define MIN2(x, y)  ((x) < (y) ? (x) : (y))
+
 #define ThrowDataFormatException(env, msg) \
         JNU_ThrowByName(env, "java/util/zip/DataFormatException", msg)
 
@@ -128,7 +130,7 @@
      *
      * Use 20 bytes as the "safe cutoff" number.
      */
-    jint in_len = MIN(this_len, len + 20);
+    jint in_len = MIN2(this_len, len + 20);
     jint consumed;
 
     in_buf = (jbyte *) malloc(in_len);