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

diff --git a/libjava/gcj/cni.h b/libjava/gcj/cni.h
new file mode 100644
index 0000000..2cdd545
--- /dev/null
+++ b/libjava/gcj/cni.h
@@ -0,0 +1,132 @@
+// gcj/cni.h -*- c++ -*-
+// This file describes the Cygnus Native Interface, CNI.
+// It provides a nicer interface to many of the things in gcj/javaprims.h.
+
+/* 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_CNI_H__
+#define __GCJ_CNI_H__
+
+#include <java/lang/Object.h>
+#include <java/lang/Class.h>
+
+#include <gcj/array.h>
+
+extern inline jobject
+JvAllocObject (jclass cls)
+{
+  return _Jv_AllocObject (cls, cls->size());
+}
+
+extern inline jobject
+JvAllocObject (jclass cls, jsize sz)
+{
+  return _Jv_AllocObject (cls, sz);
+}
+
+extern "C" jstring _Jv_NewStringUTF (const char *bytes);
+extern "C" void _Jv_InitClass (jclass);
+
+extern inline void
+JvInitClass (jclass cls)
+{
+  return _Jv_InitClass (cls);
+}
+
+extern inline jstring
+JvAllocString (jsize sz)
+{
+  return _Jv_AllocString (sz);
+}
+
+extern inline jstring
+JvNewString (const jchar *chars, jsize len)
+{
+  return _Jv_NewString (chars, len);
+}
+
+extern inline jstring
+JvNewStringLatin1 (const char *bytes, jsize len)
+{
+  return _Jv_NewStringLatin1 (bytes, len);
+}
+
+extern inline jstring
+JvNewStringLatin1 (const char *bytes)
+{
+  return _Jv_NewStringLatin1 (bytes, strlen (bytes));
+}
+
+extern inline jchar *
+_Jv_GetStringChars (jstring str)
+{
+  return (jchar*)((char*) str->data + str->boffset);
+}
+
+extern inline jchar*
+JvGetStringChars (jstring str)
+{
+  return _Jv_GetStringChars (str);
+}
+
+extern inline jsize
+JvGetStringUTFLength (jstring string)
+{
+  return _Jv_GetStringUTFLength (string);
+}
+
+extern inline jsize
+JvGetStringUTFRegion (jstring str, jsize start, jsize len, char *buf) 
+{ 
+  return _Jv_GetStringUTFRegion (str, start, len, buf); 
+} 
+
+extern inline jstring
+JvNewStringUTF (const char *bytes)
+{
+  return _Jv_NewStringUTF (bytes);
+}
+
+extern class _Jv_PrimClass _Jv_byteClass, _Jv_shortClass, _Jv_intClass,
+  _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass,
+  _Jv_doubleClass, _Jv_voidClass;
+#define JvPrimClass(TYPE) ((jclass) & _Jv_##TYPE##Class)
+
+class JvSynchronize
+{
+private:
+  jobject obj;
+public:
+  JvSynchronize (const jobject &o) : obj (o)
+    { _Jv_MonitorEnter (obj); }
+  ~JvSynchronize ()
+    { _Jv_MonitorExit (obj); }
+};
+
+// Throw some exception.
+extern void JvThrow (jobject obj) __attribute__ ((__noreturn__));
+extern inline void
+JvThrow (jobject obj)
+{
+  _Jv_Throw ((void *) obj);
+}
+
+/* Call malloc, but throw exception if insufficient memory. */
+extern inline void *
+JvMalloc (jsize size)
+{
+  return _Jv_Malloc (size);
+}
+
+extern inline void
+JvFree (void *ptr)
+{
+  return _Jv_Free (ptr);
+}
+#endif /* __GCJ_CNI_H__ */