提交 f268efe0 编写于 作者: S sherman

6990639: Fix for #6975829 breaks build

Summary: define MIN2 micro
Reviewed-by: alanb
上级 d2f03cfe
......@@ -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 @@ Java_java_util_zip_Inflater_inflateBytes(JNIEnv *env, jobject this, jlong addr,
*
* 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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册