natField.cc (BooleanClass): Don't define.
* java/lang/reflect/natField.cc (BooleanClass): Don't define. * java/lang/reflect/natArray.cc (BooleanClass): Don't define. * java/lang/Class.h (Object): Added `class$' field. * java/lang/Object.h (Object): Added `class$' field. * defineclass.cc (ClassClass): Use `class$' form. (ClassObject): Likewise. * resolve.cc (ClassObject): Use `class$' form. (ObjectClass): Likewise. * interpret.cc (ClassError): Removed. * java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Use `class$' form. (IntegerClass): Likewise. * java/net/natPlainSocketImpl.cc (BooleanClass): Use `class$' form. * java/lang/natClassLoader.cc (CloneableClass): Use `class$' form. (ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass, SerializableClass): Likewise. Include Serializable.h, Cloneable.h. * java/lang/natSystem.cc (SystemClass): Removed. (init_properties): Use `class$' form. * java/lang/natObject.cc (CloneableClass): Removed. (clone): Use `class$' form. * java/lang/natClass.cc (CloneableClass): Use `class$' form. (ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass, ConstructorClass): Likewise. * java/lang/reflect/natMethod.cc (ObjectClass): Use `class$' form. (ClassClass, VoidClass, ByteClass, ShortClass, CharacterClass, IntegerClass, LongClass, FloatClass, DoubleClass): Likewise. * java/io/natObjectInputStream.cc (ObjectClass): Use `class$' form. (ClassClass): Likewise. * include/jvm.h (StringClass): Use `class$' form. * prims.cc (ObjectClass): Removed. (_Jv_RunMain): Use `class$' form. (_Jv_AllocObject): Likewise. * jni.cc (ClassClass): Use `class$' form. (ThrowableClass): Likewise. (ObjectClass): Likewise. (MethodClass): Likewise. (ThreadGroupClass): Likewise. (NativeThreadClass): Likewise. * boehm.cc (ObjectClass): Removed. (ClassClass): Removed. (_Jv_MarkObj): Use `class$' form. * gcj/field.h (JvFieldIsRef): Use `class$' form. Include RawData.h. From-SVN: r36740
This commit is contained in:
parent
331fe257d6
commit
1d336a099d
21 changed files with 116 additions and 120 deletions
|
@ -38,31 +38,23 @@ details. */
|
|||
#include <gcj/method.h>
|
||||
#include <gnu/gcj/RawData.h>
|
||||
|
||||
#define ObjectClass _CL_Q34java4lang6Object
|
||||
extern java::lang::Class ObjectClass;
|
||||
#define ClassClass _CL_Q34java4lang5Class
|
||||
extern java::lang::Class ClassClass;
|
||||
// FIXME: remove these
|
||||
#define ObjectClass java::lang::Object::class$
|
||||
#define ClassClass java::lang::Class::class$
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <ffi.h>
|
||||
|
||||
#define VoidClass _CL_Q34java4lang4Void
|
||||
extern java::lang::Class VoidClass;
|
||||
#define ByteClass _CL_Q34java4lang4Byte
|
||||
extern java::lang::Class ByteClass;
|
||||
#define ShortClass _CL_Q34java4lang5Short
|
||||
extern java::lang::Class ShortClass;
|
||||
#define CharacterClass _CL_Q34java4lang9Character
|
||||
extern java::lang::Class CharacterClass;
|
||||
#define IntegerClass _CL_Q34java4lang7Integer
|
||||
extern java::lang::Class IntegerClass;
|
||||
#define LongClass _CL_Q34java4lang4Long
|
||||
extern java::lang::Class LongClass;
|
||||
#define FloatClass _CL_Q34java4lang5Float
|
||||
extern java::lang::Class FloatClass;
|
||||
#define DoubleClass _CL_Q34java4lang6Double
|
||||
extern java::lang::Class DoubleClass;
|
||||
// FIXME: remove these.
|
||||
#define VoidClass java::lang::Void::class$
|
||||
#define ByteClass java::lang::Byte::class$
|
||||
#define ShortClass java::lang::Short::class$
|
||||
#define CharacterClass java::lang::Character::class$
|
||||
#define IntegerClass java::lang::Integer::class$
|
||||
#define LongClass java::lang::Long::class$
|
||||
#define FloatClass java::lang::Float::class$
|
||||
#define DoubleClass java::lang::Double::class$
|
||||
|
||||
struct cpair
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue