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, 77 insertions, 0 deletions

diff --git a/libjava/gcj/array.h b/libjava/gcj/array.h
new file mode 100644
index 0000000..cd419d7
--- /dev/null
+++ b/libjava/gcj/array.h
@@ -0,0 +1,77 @@
+// array.h - Header file for CNI arrays.  -*- 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 __GCJ_ARRAY_H__
+#define __GCJ_ARRAY_H__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+
+extern "Java" {
+
+class __JArray : public java::lang::Object
+{
+public:
+  int length;
+  friend jsize JvGetArrayLength (__JArray*);
+};
+
+template<class T>
+class JArray : public __JArray
+{
+  T data[0];
+public:
+  friend T* elements<>(JArray<T>& x);
+  friend T* elements<>(JArray<T>* x);
+  // T* getData() { return data; }
+  // T& operator[](jint i) { return data[i]; }
+};
+
+template<class T>
+T* elements(JArray<T>& x) { return x.data; }
+template<class T>
+T* elements(JArray<T>* x) { return x->data; }
+
+}; // end extern "Java"
+
+/* These typesdefs match those in JNI. */
+typedef __JArray *jarray;
+typedef JArray<jobject> *jobjectArray;
+typedef JArray<jboolean> *jbooleanArray;
+typedef JArray<jbyte> *jbyteArray;
+typedef JArray<jchar> *jcharArray;
+typedef JArray<jshort> *jshortArray;
+typedef JArray<jint> *jintArray;
+typedef JArray<jlong> *jlongArray;
+typedef JArray<jfloat> *jfloatArray;
+typedef JArray<jdouble> *jdoubleArray;
+typedef JArray<jstring> *jstringArray;
+
+extern "C" jbooleanArray JvNewBooleanArray (jint length);
+extern "C" jbyteArray JvNewByteArray (jint length);
+extern "C" jcharArray JvNewCharArray (jint length);
+extern "C" jshortArray JvNewShortArray (jint length);
+extern "C" jintArray JvNewIntArray (jint length);
+extern "C" jlongArray JvNewLongArray (jint length);
+extern "C" jfloatArray JvNewFloatArray (jint length);
+extern "C" jdoubleArray JvNewDoubleArray (jint length);
+extern "C" jobjectArray _Jv_NewObjectArray(jsize length, jclass, jobject init);
+
+inline jobjectArray JvNewObjectArray (jsize length, jclass cls, jobject init)
+{ return _Jv_NewObjectArray (length, cls, init); }
+
+extern "C" jstringArray JvConvertArgv(int argc, const char **argv);
+extern "C" void JvRunMain (jclass klass, int argc, const char **argv);
+void _Jv_RunMain (const char* name, int argc, const char **argv);
+
+inline jsize JvGetArrayLength (jarray array) { return array->length; }
+
+#endif /* __GCJ_ARRAY_H__ */