From 0507a9b19f826d5f1000485b05623b51aa36af69 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 26 Jan 2000 00:55:50 +0000 Subject: field.h (struct _Jv_Field): Use "jshort" as type for nameIndex. * gcj/field.h (struct _Jv_Field): Use "jshort" as type for nameIndex. Use "jint" as type for boffset. * java/lang/Class.h (struct _Jv_Method): Made accflags a _Jv_ushort. (Class): Likewise. Also changed type of method_count, vtable_method_count, size_in_bytes, field_count, static_field_count, interface_count. * gcj/array.h (__JArray): Made `length' a const jsize, not an int. From-SVN: r31621 --- libjava/gcj/array.h | 4 +++- libjava/gcj/field.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'libjava/gcj') diff --git a/libjava/gcj/array.h b/libjava/gcj/array.h index be04545..29be1cc 100644 --- a/libjava/gcj/array.h +++ b/libjava/gcj/array.h @@ -18,7 +18,9 @@ extern "Java" { class __JArray : public java::lang::Object { public: - int length; + // FIXME: we'd like this to be `const' but that causes problems with + // the C++ compiler. + jsize length; friend jsize JvGetArrayLength (__JArray*); }; diff --git a/libjava/gcj/field.h b/libjava/gcj/field.h index 28006fc..5d2203e 100644 --- a/libjava/gcj/field.h +++ b/libjava/gcj/field.h @@ -30,13 +30,13 @@ struct _Jv_Field _Jv_ushort flags; #ifdef COMPACT_FIELDS - short nameIndex; /* offset in class's name table */ + jshort nameIndex; /* offset in class's name table */ #else _Jv_ushort bsize; /* not really needed ... */ #endif union { - int boffset; /* offset in bytes for instance field */ + jint boffset; /* offset in bytes for instance field */ void* addr; /* address of static field */ } u; -- cgit v1.1