diff src/share/vm/classfile/classFileParser.hpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents cd5d8cafcc84
children f7c4174b33ba fc9d8850ab8b
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.hpp	Fri Feb 24 18:30:42 2012 -0800
+++ b/src/share/vm/classfile/classFileParser.hpp	Mon Feb 27 13:10:13 2012 +0100
@@ -91,7 +91,7 @@
                                constantPoolHandle cp, bool is_interface,
                                FieldAllocationCount *fac,
                                objArrayHandle* fields_annotations,
-                               int* java_fields_count_ptr, TRAPS);
+                               u2* java_fields_count_ptr, TRAPS);
 
   // Method parsing
   methodHandle parse_method(constantPoolHandle cp, bool is_interface,