configure: Rebuilt.

	* configure: Rebuilt.
	* configure.in: Build include/Makefile.
	* Makefile.in: Rebuilt.
	* Makefile.am (SUBDIRS): Added gcj and include.
	(install-data-local): New target.
	(extra_headers): New macro.
	* include/Makefile.in: New file.
	* include/Makefile.am: New file.

	* interpret.cc: Don't include gcj/field.h or gcj/cni.h.
	* java/lang/reflect/natField.cc: Don't include gcj/field.h or
	gcj/cni.h.
	* boehm.cc: Don't include java-threads.h or gcj/field.h.
	* resolve.cc: Include config.h.
	* defineclass.cc: Include config.h.
	* include/java-interp.h: Don't include config.h.
	* include/jvm.h: Include java-threads.h, Object.h, java-gc.h,
	cni.h.

	* gcj/javaprims.h: Regenerated namespace decls.
	* classes.pl (scan): Don't put `;' after closing brace.

	* Makefile.in: Rebuilt.
	* Makefile.am (INCLUDES): Added -I for top_srcdir.
	* configure.in: Create gcj/Makefile.
	* gcj/Makefile.in: New file.
	* gcj/Makefile.am: New file.
	* java/lang/Object.h: Don't include any other headers.
	* gcj/array.h: Renamed from include/java-array.h.
	* gcj/field.h: Renamed from include/java-field.h.
	* gcj/method.h: Renamed from include/java-method.h.
	* gcj/cni.h, gcj/javaprims.h: Moved from include/.
	Updated all files to reflect new include structure.

From-SVN: r29278

1 files changed, 0 insertions, 169 deletions

diff --git a/libjava/include/java-field.h b/libjava/include/java-field.h
deleted file mode 100644
index d00d9ce..0000000
--- a/libjava/include/java-field.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// java-field.h - Header file for fieldID instances.  -*- c++ -*-
-
-/* Copyright (C) 1998, 1999  Cygnus Solutions
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#ifndef __JAVA_FIELD_H__
-#define __JAVA_FIELD_H__
-
-#include <java/lang/Class.h>
-#include <java/lang/reflect/Field.h>
-
-#define _Jv_FIELD_UNRESOLVED_FLAG	0x8000
-#define	_Jv_FIELD_CONSTANT_VALUE	0x4000
-
-struct _Jv_Field
-{
-#ifndef COMPACT_FIELDS
-  struct _Jv_Utf8Const*	name;
-#endif
-
-  /* The type of the field, if isResolved().
-     If !isResolved():  The fields's signature as a (Utf8Const*). */
-  jclass		type;
-
-  _Jv_ushort		flags;
-
-#ifdef COMPACT_FIELDS
-  short			nameIndex;  /* ofsfet in class's name table */
-#else
-  _Jv_ushort		bsize;  /* not really needed ... */
-#endif
-
-  union {
-    int			boffset;  /* offset in bytes for instance field */
-    void*		addr;  /* address of static field */
-  } u;
-
-#ifdef __cplusplus
-  jboolean isResolved ()
-  { return ! (flags & _Jv_FIELD_UNRESOLVED_FLAG); }
-
-  public:
-
-  int getOffset () { return u.boffset; }
-
-  jobject getObjectField (jobject obj)
-  { return *(jobject *)((char *)obj + getOffset ()); }
-
-  jfieldID getNextInstanceField () { return this + 1; }
-
-  jboolean isRef () 
-    { 
-      if (!isResolved ()) 
-	{
-	  char first = ((_Jv_Utf8Const*)type)->data[0]; 
-	  return first == '[' || first == 'L';
-	}
-      else
-	{
-	  return ! type->isPrimitive ();
-	}
-    }
-
-  // FIXME - may need to mask off internal flags.
-  int getModifiers() { return flags; }
-
-#ifdef COMPACT_FIELDS
-  _Jv_Utf8Const * getNameUtf8Const (jclass cls)
-  { return clas->fieldNames + nameIndex; }
-#else
-  _Jv_Utf8Const * getNameUtf8Const (jclass) { return name; }
-#endif
-#endif
-};
-
-#ifdef __cplusplus
-inline jbyte
-_Jv_GetStaticByteField (jclass, _Jv_Field* field)
-{
-  return * (jbyte *) field->u.addr;
-}
-
-inline jshort
-_Jv_GetStaticShortField (jclass, _Jv_Field* field)
-{
-  return * (jshort *) field->u.addr;
-}
-
-inline jint
-_Jv_GetStaticIntField (jclass, _Jv_Field* field)
-{
-  return * (jint *) field->u.addr;
-}
-
-inline jlong
-_Jv_GetStaticLongField (jclass, _Jv_Field* field)
-{
-  return * (jlong *) field->u.addr;
-}
-
-inline jobject
-_Jv_GetObjectField (jobject obj, _Jv_Field* field)
-{
-  return field->getObjectField (obj);
-}
-
-inline jbyte
-_Jv_GetByteField (jobject obj, _Jv_Field* field)
-{
-  return * (jbyte *) ((char*) obj + field->getOffset ());
-}
-
-inline jshort
-_Jv_GetShortField (jobject obj, _Jv_Field* field)
-{
-  return * (jshort *) ((char*) obj + field->getOffset ());
-}
-inline jint
-_Jv_GetIntField (jobject obj, _Jv_Field* field)
-{
-  return * (jint *) ((char*) obj + field->getOffset ());
-}
-inline jlong
-_Jv_GetLongField (jobject obj, _Jv_Field* field)
-{
-  return * (jlong *) ((char*) obj + field->getOffset ());
-}
-
-extern inline jfieldID 
-_Jv_FromReflectedField (java::lang::reflect::Field *field)
-{ 
-  return (jfieldID) ((char *) field->declaringClass->fields + field->offset); 
-} 
-
-
-#ifdef __JAVA_CNI_H__
-extern inline jfieldID
-JvGetFirstInstanceField (jclass klass)
-{
-  return &(klass->fields[klass->static_field_count]);
-}
-
-extern inline jint
-JvNumInstanceFields (jclass klass)
-{
-  return klass->field_count - klass->static_field_count;
-}
-
-extern inline jboolean
-JvFieldIsRef (jfieldID field)
-{
-  return field->isRef ();
-}
-
-extern inline jobject
-JvGetObjectField (jobject obj, _Jv_Field* field)
-{
-  return _Jv_GetObjectField (obj, field);
-}
-#endif /* defined (__JAVA_CNI_H__) */
-
-#endif
-
-#endif /* __JAVA_FIELD_H */