[kaffe] CVS kaffe (robilad): resynced with GNU Classpath: jni header merge with gcj

Kaffe CVS cvs-commits at kaffe.org
Sat May 14 15:00:55 PDT 2005


PatchSet 6458 
Date: 2005/05/14 21:46:15
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with GNU Classpath: jni header merge with gcj

        Resynced with GNU Classpath.

        2005-04-24  Tom Tromey  <tromey at redhat.com>

        * include/jni_md-x86-linux-gnu.h (JNIIMPORT): New define.
        (jsize): New typedef.
        * include/jni.h: Re-merged with libgcj.

Members: 
	ChangeLog:1.3985->1.3986 
	Makefile.in:1.213->1.214 
	configure:1.450->1.451 
	configure.ac:1.138->1.139 
	config/Makefile.in:1.182->1.183 
	include/Makefile.am:1.99->1.100 
	include/Makefile.in:1.228->1.229 
	include/files.h:INITIAL->1.7 
	include/jni.h:INITIAL->1.36 
	include/jni_md.h:INITIAL->1.1 
	include/kaffe/jni_md.h.in:1.2->1.3(DEAD) 
	kaffe/Makefile.in:1.147->1.148 
	kaffe/jvmpi/Makefile.in:1.70->1.71 
	kaffe/kaffe/Makefile.in:1.168->1.169 
	kaffe/kaffe/main.c:INITIAL->1.83 
	kaffe/kaffeh/Makefile.in:1.147->1.148 
	kaffe/kaffeh/java_lang_String.h:1.1->1.2 
	kaffe/kaffeh/mem.c:1.11->1.12 
	kaffe/kaffeh/support.c:1.49->1.50 
	kaffe/kaffevm/Makefile.in:1.200->1.201 
	kaffe/kaffevm/classMethod.c:1.141->1.142 
	kaffe/kaffevm/code.c:1.20->1.21 
	kaffe/kaffevm/debug.c:INITIAL->1.64 
	kaffe/kaffevm/exception.c:1.99->1.100 
	kaffe/kaffevm/gtypes.h:1.17->1.18 
	kaffe/kaffevm/itypes.c:1.37->1.38 
	kaffe/kaffevm/lookup.c:INITIAL->1.46 
	kaffe/kaffevm/stackTrace.c:1.47->1.48 
	kaffe/kaffevm/stats.c:1.8->1.9 
	kaffe/kaffevm/string.c:1.43->1.44 
	kaffe/kaffevm/support.c:1.83->1.84 
	kaffe/kaffevm/thread.c:1.97->1.98 
	kaffe/kaffevm/thread.h:1.27->1.28 
	kaffe/kaffevm/utf8const.c:1.50->1.51 
	kaffe/kaffevm/boehm-gc/Makefile.in:1.33->1.34 
	kaffe/kaffevm/boehm-gc/gc2.c:1.11->1.12 
	kaffe/kaffevm/gcj/Makefile.in:1.127->1.128 
	kaffe/kaffevm/intrp/Makefile.in:1.136->1.137 
	kaffe/kaffevm/intrp/icode.h:1.24->1.25 
	kaffe/kaffevm/jit/Makefile.in:1.143->1.144 
	kaffe/kaffevm/jit3/Makefile.in:1.114->1.115 
	kaffe/kaffevm/jni/Makefile.in:1.39->1.40 
	kaffe/kaffevm/jni/jni-arrays.c:1.6->1.7 
	kaffe/kaffevm/jni/jni-fields.c:1.4->1.5 
	kaffe/kaffevm/jni/jni-string.c:1.10->1.11 
	kaffe/kaffevm/jni/jni.c:1.26->1.27 
	kaffe/kaffevm/jni/jni_funcs.h:1.8->1.9 
	kaffe/kaffevm/jni/jnirefs.h:1.2->1.3 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.32->1.33 
	kaffe/kaffevm/systems/Makefile.in:1.135->1.136 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.127->1.128 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.133->1.134 
	kaffe/kaffevm/systems/oskit-pthreads/lock-impl.h:1.3->1.4 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.137->1.138 
	kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.135->1.136 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.112->1.113 
	kaffe/kaffevm/systems/win32/winthread.c:1.4->1.5 
	kaffe/kaffevm/verifier/Makefile.in:1.39->1.40 
	kaffe/man/Makefile.in:1.134->1.135 
	kaffe/scripts/Makefile.in:1.173->1.174 
	kaffe/scripts/bat/Makefile.in:1.126->1.127 
	kaffe/scripts/compat/Makefile.in:1.151->1.152 
	kaffe/xprof/Makefile.in:1.102->1.103 
	libraries/Makefile.in:1.130->1.131 
	libraries/clib/Makefile.in:1.145->1.146 
	libraries/clib/awt/Makefile.in:1.144->1.145 
	libraries/clib/awt/X/Makefile.in:1.136->1.137 
	libraries/clib/awt/classpath-gtk/Makefile.in:1.25->1.26 
	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.34->1.35 
	libraries/clib/awt/classpath-gtk/resource/Makefile.in:1.24->1.25 
	libraries/clib/awt/nano-X/Makefile.in:1.9->1.10 
	libraries/clib/awt/qt/Makefile.in:1.93->1.94 
	libraries/clib/classpath/Makefile.in:1.18->1.19 
	libraries/clib/fdlibm/Makefile.in:1.2->1.3 
	libraries/clib/io/Makefile.in:1.141->1.142 
	libraries/clib/libxmlj/Makefile.in:1.44->1.45 
	libraries/clib/management/Makefile.in:1.147->1.148 
	libraries/clib/math/Makefile.in:1.142->1.143 
	libraries/clib/native/Class.c:INITIAL->1.82 
	libraries/clib/native/Makefile.in:1.181->1.182 
	libraries/clib/native/java_lang_VMDouble.c:1.1->1.2 
	libraries/clib/net/Makefile.in:1.151->1.152 
	libraries/clib/net/PlainDatagramSocketImpl.c:1.52->1.53 
	libraries/clib/net/PlainSocketImpl.c:1.54->1.55 
	libraries/clib/nio/Makefile.in:1.72->1.73 
	libraries/clib/security/Makefile.in:1.113->1.114 
	libraries/clib/sound/Makefile.in:1.39->1.40 
	libraries/clib/sound/alsa/Makefile.in:1.40->1.41 
	libraries/clib/sound/common/Makefile.in:1.39->1.40 
	libraries/clib/sound/esd/Makefile.in:1.40->1.41 
	libraries/clib/zip/Deflater.c:INITIAL->1.17 
	libraries/clib/zip/Inflater.c:INITIAL->1.16 
	libraries/clib/zip/Makefile.in:1.144->1.145 
	libraries/extensions/Makefile.in:1.122->1.123 
	libraries/extensions/comm/Makefile.in:1.116->1.117 
	libraries/extensions/comm/javalib/Makefile.in:1.117->1.118 
	libraries/extensions/microsoft/Makefile.in:1.108->1.109 
	libraries/extensions/microsoft/clib/Makefile.in:1.112->1.113 
	libraries/extensions/microsoft/javalib/Makefile.in:1.110->1.111 
	libraries/extensions/pjava/Makefile.in:1.116->1.117 
	libraries/extensions/pjava/javalib/Makefile.in:1.117->1.118 
	libraries/extensions/servlet/Makefile.in:1.116->1.117 
	libraries/extensions/servlet/javalib/Makefile.in:1.117->1.118 
	libraries/javalib/Makefile.in:1.436->1.437 
	libraries/javalib/awt-implementations/Makefile.in:1.24->1.25 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.27->1.28 
	libraries/javalib/gmp-math/Makefile.in:1.29->1.30 
	replace/Makefile.in:1.83->1.84 
	test/Makefile.in:1.139->1.140 
	test/internal/Makefile.in:1.104->1.105 
	test/jni/Makefile.in:1.36->1.37 
	test/regression/Makefile.in:1.211->1.212 
	test/regression/compile_time/Makefile.in:1.67->1.68 
	test/regression/compiler/Makefile.in:1.50->1.51 
	test/regression/run_time/Makefile.in:1.66->1.67 
	tools/Makefile.in:1.40->1.41 
	tools/gjdoc/Makefile.in:1.40->1.41 
	tools/gjdoc/javalib/Makefile.in:1.51->1.52 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3985 kaffe/ChangeLog:1.3986
--- kaffe/ChangeLog:1.3985	Fri May 13 21:05:51 2005
+++ kaffe/ChangeLog	Sat May 14 21:46:15 2005
@@ -1,5 +1,76 @@
 2005-05-13  Dalibor Topic  <robilad at kaffe.org>
 
+        * include/jni_md.h: New file. 
+	Merged in from GNU Classpath and gcj.
+
+        * include/kaffe/jni_md.h.in: Removed.
+
+        * configure.ac: Don't generate include/kaffe/jni_md.h.
+
+        * include/Makefile.am (include_HEADERS): Added jni_md.h.
+	(pkginclude_HEADERS) Removed kaffe/jni_md.h.
+
+        * kaffe/kaffevm/gtypes.h: Added typedefs 
+	for jword and jref.
+
+        * kaffe/kaffevm/jni/jnirefs.h: Include gtypes.h.
+
+        * kaffe/kaffevm/intrp/icode.h (JINT_MIN, JLONG_MIN) 
+	Define them here in term of stdint values.
+
+        * libraries/clib/net/PlainDatagramSocketImpl.c
+	(gnu_java_net_PlainDatagramSocketImpl_setTTL): 
+	Make the second parameter a jbyte as in the prototype.
+
+        kaffe/kaffeh/java_lang_String.h,
+        kaffe/kaffevm/classMethod.c,
+        kaffe/kaffevm/thread.c,
+        kaffe/kaffevm/thread.h,
+        kaffe/kaffevm/jni/jni-arrays.c,
+        kaffe/kaffevm/jni/jni-fields.c,
+        kaffe/kaffevm/jni/jni-string.c,
+        kaffe/kaffevm/jni/jni.c,
+        kaffe/kaffevm/jni/jni_funcs.h,
+        kaffe/kaffevm/systems/oskit-pthreads/lock-impl.h,
+        kaffe/kaffevm/systems/unix-jthreads/jthread.c,
+        kaffe/kaffevm/systems/win32/winthread.c,
+        libraries/clib/native/Class.c,
+        libraries/clib/native/java_lang_VMDouble.c,
+        libraries/clib/net/PlainSocketImpl.c,
+        libraries/clib/zip/Deflater.c,
+        libraries/clib/zip/Inflater.c:
+	Use jboolean instead of jbool.
+
+        * include/files.h,
+        include/jni.h,
+        kaffe/kaffe/main.c,
+        kaffe/kaffeh/mem.c,
+        kaffe/kaffeh/support.c,
+        kaffe/kaffevm/code.c,
+        kaffe/kaffevm/debug.c,
+        kaffe/kaffevm/exception.c,
+        kaffe/kaffevm/itypes.c,
+        kaffe/kaffevm/lookup.c,
+        kaffe/kaffevm/stackTrace.c,
+        kaffe/kaffevm/stats.c,
+        kaffe/kaffevm/string.c,
+        kaffe/kaffevm/support.c,
+        kaffe/kaffevm/thread.c,
+        kaffe/kaffevm/utf8const.c,
+        kaffe/kaffevm/boehm-gc/gc2.c,
+        kaffe/kaffevm/systems/unix-jthreads/jthread.c:
+	Include jni_md.h instead of kaffe/jni_md.h.
+
+	Resynced with GNU Classpath.
+
+	2005-04-24  Tom Tromey  <tromey at redhat.com>
+
+        * include/jni_md-x86-linux-gnu.h (JNIIMPORT): New define.
+        (jsize): New typedef.
+        * include/jni.h: Re-merged with libgcj.
+
+2005-05-13  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/kaffevm/kaffe-gc/Makefile.am,
 	kaffe/kaffevm/verifier/Makefile.am,
 	replace/Makefile.am:
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.213 kaffe/Makefile.in:1.214
--- kaffe/Makefile.in:1.213	Fri May 13 17:08:39 2005
+++ kaffe/Makefile.in	Sat May 14 21:46:19 2005
@@ -56,7 +56,6 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/project.properties.in \
 	$(srcdir)/project.xml.in $(top_srcdir)/configure \
-	$(top_srcdir)/include/kaffe/jni_md.h.in \
 	$(top_srcdir)/libraries/javalib/gnu/classpath/Configuration.java.in \
 	ABOUT-NLS AUTHORS ChangeLog INSTALL TODO scripts/compile \
 	scripts/config.guess scripts/config.rpath scripts/config.sub \
@@ -90,8 +89,7 @@
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config/config.h \
-	$(top_builddir)/include/kaffe/jni_md.h
+CONFIG_HEADER = $(top_builddir)/config/config.h
 CONFIG_CLEAN_FILES = project.xml project.properties \
 	libraries/javalib/gnu/classpath/Configuration.java
 SCRIPTS = $(noinst_SCRIPTS)
@@ -590,23 +588,6 @@
 	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-include/kaffe/jni_md.h: include/kaffe/stamp-h2
-	@if test ! -f $@; then \
-	  rm -f include/kaffe/stamp-h2; \
-	  $(MAKE) include/kaffe/stamp-h2; \
-	else :; fi
-
-include/kaffe/stamp-h2: $(top_srcdir)/include/kaffe/jni_md.h.in $(top_builddir)/config.status
-	@rm -f include/kaffe/stamp-h2
-	cd $(top_builddir) && $(SHELL) ./config.status include/kaffe/jni_md.h
-$(top_srcdir)/include/kaffe/jni_md.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f include/kaffe/stamp-h2
-	touch $@
-
-distclean-hdr:
-	-rm -f include/kaffe/jni_md.h include/kaffe/stamp-h2
 project.xml: $(top_builddir)/config.status $(srcdir)/project.xml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 project.properties: $(top_builddir)/config.status $(srcdir)/project.properties.in
@@ -759,7 +740,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/binreloc $(distdir)/compat-include $(distdir)/developers $(distdir)/include/kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/libraries/javalib/gnu/classpath $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib
+	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/binreloc $(distdir)/compat-include $(distdir)/developers $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/libraries/javalib/gnu/classpath $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -936,8 +917,8 @@
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -985,13 +966,13 @@
 	check-am check-local clean clean-generic clean-libtool \
 	clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
 	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+	distclean-generic distclean-libtool distclean-recursive \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am uninstall-info-am
Index: kaffe/configure
diff -u kaffe/configure:1.450 kaffe/configure:1.451
--- kaffe/configure:1.450	Fri May 13 17:08:41 2005
+++ kaffe/configure	Sat May 14 21:46:19 2005
@@ -50851,7 +50851,7 @@
 
 subdirs="$subdirs libltdl"
 
-                    ac_config_headers="$ac_config_headers config/config.h include/kaffe/jni_md.h"
+          ac_config_headers="$ac_config_headers config/config.h"
 
           ac_config_files="$ac_config_files Makefile"
 
@@ -51949,7 +51949,6 @@
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "$ac_stdint_h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS $ac_stdint_h" ;;
   "config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;;
-  "include/kaffe/jni_md.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/kaffe/jni_md.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.138 kaffe/configure.ac:1.139
--- kaffe/configure.ac:1.138	Fri May 13 17:08:46 2005
+++ kaffe/configure.ac	Sat May 14 21:46:25 2005
@@ -2249,7 +2249,7 @@
 
 
 AC_CONFIG_SUBDIRS([libltdl])
-AC_CONFIG_HEADERS([config/config.h include/kaffe/jni_md.h])
+AC_CONFIG_HEADERS([config/config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([project.xml project.properties])
 AC_CONFIG_FILES([config/Makefile])
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.182 kaffe/config/Makefile.in:1.183
--- kaffe/config/Makefile.in:1.182	Fri May 13 17:08:47 2005
+++ kaffe/config/Makefile.in	Sat May 14 21:46:26 2005
@@ -75,7 +75,7 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = config.h $(top_builddir)/include/kaffe/jni_md.h
+CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.99 kaffe/include/Makefile.am:1.100
--- kaffe/include/Makefile.am:1.99	Sun Apr 24 09:57:36 2005
+++ kaffe/include/Makefile.am	Sat May 14 21:46:26 2005
@@ -278,6 +278,7 @@
 
 include_HEADERS = \
 	jni.h \
+	jni_md.h \
 	jni_cpp.h \
 	jvmpi.h \
 	kaffe_jni.h \
@@ -295,8 +296,7 @@
 	java_lang_ThreadGroup.h \
 	java_lang_Throwable.h \
 	java_lang_VMThrowable.h \
-	kaffe/jmalloc.h \
-	kaffe/jni_md.h
+	kaffe/jmalloc.h
 
 stamp-kaffeh:
 ## If KAFFEH does not exist, build it
@@ -363,7 +363,6 @@
 DISTCLEANFILES = \
 	$(DERIVED_HDRS) \
 	$(JNI_DERIVED_HDRS) \
-	kaffe/jni_md.h \
 	stamp-h0all \
 	stamp-h1all \
 	stamp-libtritonusalsa \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.228 kaffe/include/Makefile.in:1.229
--- kaffe/include/Makefile.in:1.228	Fri May 13 17:08:48 2005
+++ kaffe/include/Makefile.in	Sat May 14 21:46:26 2005
@@ -77,13 +77,12 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config/config.h \
-	$(top_builddir)/include/kaffe/jni_md.h
+CONFIG_HEADER = $(top_builddir)/config/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__include_HEADERS_DIST = jni.h jni_cpp.h jvmpi.h kaffe_jni.h jawt.h \
-	jawt_md.h
+am__include_HEADERS_DIST = jni.h jni_md.h jni_cpp.h jvmpi.h \
+	kaffe_jni.h jawt.h jawt_md.h
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -613,6 +612,7 @@
 
 include_HEADERS = \
 	jni.h \
+	jni_md.h \
 	jni_cpp.h \
 	jvmpi.h \
 	kaffe_jni.h \
@@ -630,8 +630,7 @@
 	java_lang_ThreadGroup.h \
 	java_lang_Throwable.h \
 	java_lang_VMThrowable.h \
-	kaffe/jmalloc.h \
-	kaffe/jni_md.h
+	kaffe/jmalloc.h
 
 CLEANFILES = \
 	$(DERIVED_HDRS) \
@@ -641,7 +640,6 @@
 DISTCLEANFILES = \
 	$(DERIVED_HDRS) \
 	$(JNI_DERIVED_HDRS) \
-	kaffe/jni_md.h \
 	stamp-h0all \
 	stamp-h1all \
 	stamp-libtritonusalsa \
===================================================================
Checking out kaffe/include/files.h
RCS:  /home/cvs/kaffe/kaffe/include/files.h,v
VERS: 1.7
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/include/files.h	Sat May 14 22:00:55 2005
@@ -0,0 +1,50 @@
+/*
+ * files.h
+ *
+ * Copyright (c) 1996, 1997
+ *	Transvirtual Technologies, Inc.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ */
+
+#ifndef __files_h
+#define __files_h
+
+#include "config.h"
+#include "config-std.h"
+#include "config-io.h"
+#include "jni_md.h"
+#include <errno.h>
+
+#if defined(HAVE_STRING_H)
+#include <string.h>
+#endif
+
+#if defined(HAVE_STRERROR)
+#define	SYS_ERROR(x)	(char*)strerror(x)
+#else
+extern char* sys_errlist[];
+#define	SYS_ERROR(x)	sys_errlist[x]
+#endif
+
+/* Define access() flags if not already defined */
+#if !defined(W_OK)
+#define	W_OK		2
+#define	R_OK		4
+#endif
+
+/* If we don't have O_BINARY, define it to be 0 */
+#if !defined(O_BINARY)
+#define	O_BINARY	0
+#endif
+
+/* Convert jlong's to and from off_t's */
+#define	jlong2off_t(j)		((off_t)(j))
+#define	off_t2jlong(j)		((jlong)(j))
+
+/* Convert jlong's to and from size_t's */
+#define jlong2size_t(j)         ((size_t)(j))
+#define size_t2jlong(j)         ((jlong)(j))
+
+#endif
===================================================================
Checking out kaffe/include/jni.h
RCS:  /home/cvs/kaffe/kaffe/include/jni.h,v
VERS: 1.36
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/include/jni.h	Sat May 14 22:00:55 2005
@@ -0,0 +1,1599 @@
+/* jni.h
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005  Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+/* Note: this file must be compilable by the C compiler (for now,
+   assuming GNU C is ok).  This means you must never use `//'
+   comments, and all C++-specific code must be conditional on
+   __cplusplus.  */
+
+#ifndef _CLASSPATH_JNI_H
+#define _CLASSPATH_JNI_H
+
+/* We include <stdio.h> for compatibility with Sun's <jni.h>.  */
+#include <stdio.h>
+
+#include <stdarg.h>
+
+#include "jni_md.h"
+
+/* The VM might define jobject and friends.  */
+#ifndef _CLASSPATH_VM_JNI_TYPES_DEFINED
+
+# ifdef __cplusplus
+
+/* Define dummy classes and then define the JNI types as pointers.  */
+struct __jobject {};
+struct __jclass : __jobject {};
+struct __jstring : __jobject {};
+struct __jthrowable : __jobject {};
+struct __jweak : __jobject {};
+struct __jarray : __jobject {};
+struct __jobjectArray : __jarray {};
+struct __jbyteArray : __jarray {};
+struct __jshortArray : __jarray {};
+struct __jintArray : __jarray {};
+struct __jlongArray : __jarray {};
+struct __jbooleanArray : __jarray {};
+struct __jcharArray : __jarray {};
+struct __jfloatArray : __jarray {};
+struct __jdoubleArray : __jarray {};
+
+typedef __jobject *jobject;
+typedef __jclass *jclass;
+typedef __jstring *jstring;
+typedef __jthrowable *jthrowable;
+typedef __jweak *jweak;
+typedef __jarray *jarray;
+typedef __jobjectArray *jobjectArray;
+typedef __jbyteArray *jbyteArray;
+typedef __jshortArray *jshortArray;
+typedef __jintArray *jintArray;
+typedef __jlongArray *jlongArray;
+typedef __jbooleanArray *jbooleanArray;
+typedef __jcharArray *jcharArray;
+typedef __jfloatArray *jfloatArray;
+typedef __jdoubleArray *jdoubleArray;
+
+#define JNI_TRUE true
+#define JNI_FALSE false
+
+typedef struct _Jv_JNIEnv JNIEnv;
+typedef struct _Jv_JavaVM JavaVM;
+
+# else /* __cplusplus */
+
+/* For C, simply define the class types as generic pointers.  */
+typedef void *jobject;
+typedef jobject jclass;
+typedef jobject jstring;
+typedef jobject jthrowable;
+typedef jobject jweak;
+typedef jobject jarray;
+typedef jobject jobjectArray;
+typedef jobject jbyteArray;
+typedef jobject jshortArray;
+typedef jobject jintArray;
+typedef jobject jlongArray;
+typedef jobject jbooleanArray;
+typedef jobject jcharArray;
+typedef jobject jfloatArray;
+typedef jobject jdoubleArray;
+
+#define JNI_TRUE  1
+#define JNI_FALSE 0
+
+typedef const struct JNINativeInterface *JNIEnv;
+typedef const struct JNIInvokeInterface *JavaVM;
+
+# endif /* __cplusplus */
+
+#endif /* _CLASSPATH_VM_JNI_TYPES_DEFINED */
+
+/* 
+ * Before jni.h is #included within a typical JVM, the source code should 
+ * #define _JNI_VM_INTERNAL_TYPES_DEFINED and provide the real declarations
+ * for 'jobject', 'jfieldID', 'jmethodID' and other implementation types.
+ * If _JNI_VM_INTERNAL_TYPES_DEFINED is not defined, the following 
+ * declares the old versions of the types.
+ */
+#ifndef _CLASSPATH_VM_INTERNAL_TYPES_DEFINED
+struct _jfieldID;
+struct _jmethodID;
+typedef struct _jfieldID *jfieldID;
+typedef struct _jmethodID *jmethodID;
+#endif 
+
+/* Version numbers.  */
+#define JNI_VERSION_1_1 0x00010001
+#define JNI_VERSION_1_2 0x00010002
+#define JNI_VERSION_1_4 0x00010004
+
+/* Used when releasing array elements.  */
+#define JNI_COMMIT 1
+#define JNI_ABORT  2
+
+/* Error codes */
+#define JNI_OK            0
+#define JNI_ERR          (-1)
+#define JNI_EDETACHED    (-2)
+#define JNI_EVERSION     (-3)
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+/* These functions might be defined in libraries which we load; the
+   JNI implementation calls them at the appropriate times.  */
+extern JNIEXPORT jint JNICALL JNI_OnLoad (JavaVM *, void *);
+extern JNIEXPORT void JNICALL JNI_OnUnload (JavaVM *, void *);
+
+/* This can be defined as JNIIMPORT or JNIEXPORT by the md file,
+   depending on whether this is the implementation or a user.  */
+#ifndef _CLASSPATH_JNIIMPEXP
+#define _CLASSPATH_JNIIMPEXP JNIIMPORT
+#endif
+
+/* These functions are called by user code to start using the
+   invocation API.  */
+extern _CLASSPATH_JNIIMPEXP jint JNICALL
+JNI_GetDefaultJavaVMInitArgs (void *);
+
+extern _CLASSPATH_JNIIMPEXP jint JNICALL
+JNI_CreateJavaVM (JavaVM **, void **, void *);
+
+extern _CLASSPATH_JNIIMPEXP jint JNICALL
+JNI_GetCreatedJavaVMs (JavaVM **, jsize, jsize *);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+typedef union jvalue
+{
+  jboolean z;
+  jbyte    b;
+  jchar    c;
+  jshort   s;
+  jint     i;
+  jlong    j;
+  jfloat   f;
+  jdouble  d;
+  jobject  l;
+} jvalue;
+
+/* This structure is used when registering native methods.  */
+typedef struct
+{
+  char *name;
+  char *signature;
+  void *fnPtr;			/* Sigh.  */
+} JNINativeMethod;
+
+struct JNINativeInterface
+{
+  void *reserved0;
+  void *reserved1;
+  void *reserved2;
+  void *reserved3;
+
+  jint     (JNICALL *GetVersion)                   (JNIEnv *);
+  jclass   (JNICALL *DefineClass)                  (JNIEnv *, const char *,
+						    jobject, const jbyte *,
+						    jsize);
+  jclass   (JNICALL *FindClass)                    (JNIEnv *, const char *);
+
+  jmethodID (JNICALL *FromReflectedMethod)	   (JNIEnv *, jobject);
+  jfieldID  (JNICALL *FromReflectedField)	   (JNIEnv *, jobject);
+  jobject   (JNICALL *ToReflectedMethod)	   (JNIEnv *, jclass,
+						    jmethodID, jboolean);
+
+  jclass   (JNICALL *GetSuperclass)                (JNIEnv *, jclass);
+  jboolean (JNICALL *IsAssignableFrom)             (JNIEnv *, jclass, jclass);
+
+  jobject  (JNICALL *ToReflectedField)		   (JNIEnv *, jclass, jfieldID,
+                                                    jboolean);
+
+  jint     (JNICALL *Throw)                        (JNIEnv *, jthrowable);
+  jint     (JNICALL *ThrowNew)                     (JNIEnv *, jclass, 
+                                                    const char *);
+  jthrowable (JNICALL *ExceptionOccurred)          (JNIEnv *);
+  void     (JNICALL *ExceptionDescribe)            (JNIEnv *);
+  void     (JNICALL *ExceptionClear)               (JNIEnv *);
+  void     (JNICALL *FatalError)                   (JNIEnv *, const char *);
+
+  jint     (JNICALL *PushLocalFrame)		   (JNIEnv *, jint);
+  jobject  (JNICALL *PopLocalFrame)		   (JNIEnv *, jobject);
+
+  jobject  (JNICALL *NewGlobalRef)                 (JNIEnv *, jobject);
+  void     (JNICALL *DeleteGlobalRef)              (JNIEnv *, jobject);
+  void     (JNICALL *DeleteLocalRef)               (JNIEnv *, jobject);
+  jboolean (JNICALL *IsSameObject)                 (JNIEnv *, jobject, 
+                                                    jobject);
+
+  jobject  (JNICALL *NewLocalRef)		   (JNIEnv *, jobject);
+  jint     (JNICALL *EnsureLocalCapacity)	   (JNIEnv *, jint);
+
+  jobject  (JNICALL *AllocObject)                  (JNIEnv *, jclass);
+  jobject (JNICALL *NewObject)			   (JNIEnv *, jclass, 
+                                                    jmethodID, ...);
+  jobject (JNICALL *NewObjectV)			   (JNIEnv *, jclass, 
+                                                    jmethodID, va_list);
+  jobject (JNICALL *NewObjectA)			   (JNIEnv *, jclass, 
+                                                    jmethodID, jvalue *);
+
+  jclass   (JNICALL *GetObjectClass)               (JNIEnv *, jobject);
+  jboolean (JNICALL *IsInstanceOf)                 (JNIEnv *, jobject, jclass);
+  jmethodID (JNICALL *GetMethodID)                 (JNIEnv *, jclass, 
+                                                    const char *, const char *);
+
+  jobject (JNICALL *CallObjectMethod)	   (JNIEnv *, jobject, jmethodID, ...);
+  jobject (JNICALL *CallObjectMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jobject (JNICALL *CallObjectMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  jboolean (JNICALL *CallBooleanMethod)	   (JNIEnv *, jobject, jmethodID,
+                                            ...);
+  jboolean (JNICALL *CallBooleanMethodV)   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jboolean (JNICALL *CallBooleanMethodA)   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  jbyte (JNICALL *CallByteMethod)   (JNIEnv *, jobject, jmethodID, ...);
+  jbyte (JNICALL *CallByteMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jbyte (JNICALL *CallByteMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  jchar (JNICALL *CallCharMethod)	   (JNIEnv *, jobject, jmethodID, ...);
+  jchar (JNICALL *CallCharMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jchar (JNICALL *CallCharMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  jshort (JNICALL *CallShortMethod)	   (JNIEnv *, jobject, jmethodID, ...);
+  jshort (JNICALL *CallShortMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jshort (JNICALL *CallShortMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  jint 	(JNICALL *CallIntMethod)	   (JNIEnv *, jobject, jmethodID, ...);
+  jint 	(JNICALL *CallIntMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jint 	(JNICALL *CallIntMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  jlong (JNICALL *CallLongMethod)	   (JNIEnv *, jobject, jmethodID, ...);
+  jlong (JNICALL *CallLongMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jlong (JNICALL *CallLongMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  jfloat (JNICALL *CallFloatMethod)	   (JNIEnv *, jobject, jmethodID, ...);
+  jfloat (JNICALL *CallFloatMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jfloat (JNICALL *CallFloatMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  jdouble (JNICALL *CallDoubleMethod)	   (JNIEnv *, jobject, jmethodID, ...);
+  jdouble (JNICALL *CallDoubleMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  jdouble (JNICALL *CallDoubleMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+  void  (JNICALL *CallVoidMethod)	   (JNIEnv *, jobject, jmethodID, ...);
+  void  (JNICALL *CallVoidMethodV)	   (JNIEnv *, jobject, jmethodID,
+                                            va_list);
+  void  (JNICALL *CallVoidMethodA)	   (JNIEnv *, jobject, jmethodID,
+                                            jvalue *);
+
+  jobject   (JNICALL *CallNonvirtualObjectMethod)  (JNIEnv *, jobject, jclass,
+                                                    jmethodID, ...);
+  jobject   (JNICALL *CallNonvirtualObjectMethodV) (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  jobject   (JNICALL *CallNonvirtualObjectMethodA) (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+  jboolean  (JNICALL *CallNonvirtualBooleanMethod) (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  jboolean  (JNICALL *CallNonvirtualBooleanMethodV) (JNIEnv *, jobject, jclass,
+					             jmethodID, va_list);
+  jboolean  (JNICALL *CallNonvirtualBooleanMethodA) (JNIEnv *, jobject, jclass,
+					             jmethodID, jvalue *);
+  jbyte     (JNICALL *CallNonvirtualByteMethod)	   (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  jbyte     (JNICALL *CallNonvirtualByteMethodV)   (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  jbyte     (JNICALL *CallNonvirtualByteMethodA)   (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+  jchar     (JNICALL *CallNonvirtualCharMethod)	   (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  jchar     (JNICALL *CallNonvirtualCharMethodV)   (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  jchar     (JNICALL *CallNonvirtualCharMethodA)   (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+  jshort    (JNICALL *CallNonvirtualShortMethod)   (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  jshort    (JNICALL *CallNonvirtualShortMethodV)  (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  jshort    (JNICALL *CallNonvirtualShortMethodA)  (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+  jint 	    (JNICALL *CallNonvirtualIntMethod)	   (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  jint 	    (JNICALL *CallNonvirtualIntMethodV)	   (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  jint 	    (JNICALL *CallNonvirtualIntMethodA)	   (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+  jlong     (JNICALL *CallNonvirtualLongMethod)	   (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  jlong     (JNICALL *CallNonvirtualLongMethodV)   (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  jlong     (JNICALL *CallNonvirtualLongMethodA)   (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+  jfloat    (JNICALL *CallNonvirtualFloatMethod)   (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  jfloat    (JNICALL *CallNonvirtualFloatMethodV)  (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  jfloat    (JNICALL *CallNonvirtualFloatMethodA)  (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+  jdouble   (JNICALL *CallNonvirtualDoubleMethod)  (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  jdouble   (JNICALL *CallNonvirtualDoubleMethodV) (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  jdouble   (JNICALL *CallNonvirtualDoubleMethodA) (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+  void      (JNICALL *CallNonvirtualVoidMethod)	   (JNIEnv *, jobject, jclass,
+					            jmethodID, ...);
+  void      (JNICALL *CallNonvirtualVoidMethodV)   (JNIEnv *, jobject, jclass,
+					            jmethodID, va_list);
+  void      (JNICALL *CallNonvirtualVoidMethodA)   (JNIEnv *, jobject, jclass,
+					            jmethodID, jvalue *);
+
+  jfieldID  (JNICALL *GetFieldID)          (JNIEnv *, jclass, const char *,
+					    const char *);
+
+  jobject  (JNICALL *GetObjectField)       (JNIEnv *, jobject, jfieldID);
+  jboolean (JNICALL *GetBooleanField)      (JNIEnv *, jobject, jfieldID);
+  jbyte    (JNICALL *GetByteField)         (JNIEnv *, jobject, jfieldID);
+  jchar    (JNICALL *GetCharField)         (JNIEnv *, jobject, jfieldID);
+  jshort   (JNICALL *GetShortField)        (JNIEnv *, jobject, jfieldID);
+  jint     (JNICALL *GetIntField)          (JNIEnv *, jobject, jfieldID);
+  jlong    (JNICALL *GetLongField)         (JNIEnv *, jobject, jfieldID);
+  jfloat   (JNICALL *GetFloatField)        (JNIEnv *, jobject, jfieldID);
+  jdouble  (JNICALL *GetDoubleField)       (JNIEnv *, jobject, jfieldID);
+
+  void	(JNICALL *SetObjectField)	   (JNIEnv *, jobject,
+					    jfieldID, jobject);
+  void	(JNICALL *SetBooleanField)	   (JNIEnv *, jobject,
+					    jfieldID, jboolean);
+  void	(JNICALL *SetByteField)		   (JNIEnv *, jobject,
+					    jfieldID, jbyte);
+  void	(JNICALL *SetCharField)		   (JNIEnv *, jobject,
+					    jfieldID, jchar);
+  void	(JNICALL *SetShortField)	   (JNIEnv *, jobject,
+					    jfieldID, jshort);
+  void	(JNICALL *SetIntField)		   (JNIEnv *, jobject,
+					    jfieldID, jint);
+  void	(JNICALL *SetLongField)		   (JNIEnv *, jobject,
+					    jfieldID, jlong);
+  void	(JNICALL *SetFloatField)	   (JNIEnv *, jobject,
+					    jfieldID, jfloat);
+  void	(JNICALL *SetDoubleField)	   (JNIEnv *, jobject,
+					    jfieldID, jdouble);
+
+  jmethodID (JNICALL *GetStaticMethodID)   (JNIEnv *, jclass, const char *,
+					    const char *);
+
+  jobject  (JNICALL *CallStaticObjectMethod)  (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jobject  (JNICALL *CallStaticObjectMethodV) (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  jobject  (JNICALL *CallStaticObjectMethodA) (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+  jboolean (JNICALL *CallStaticBooleanMethod) (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jboolean (JNICALL *CallStaticBooleanMethodV) (JNIEnv *, jclass, jmethodID,
+					        va_list);
+  jboolean (JNICALL *CallStaticBooleanMethodA) (JNIEnv *, jclass, jmethodID,
+					        jvalue *);
+  jbyte	   (JNICALL *CallStaticByteMethod)    (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jbyte    (JNICALL *CallStaticByteMethodV)   (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  jbyte    (JNICALL *CallStaticByteMethodA)   (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+  jchar    (JNICALL *CallStaticCharMethod)    (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jchar    (JNICALL *CallStaticCharMethodV)   (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  jchar    (JNICALL *CallStaticCharMethodA)   (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+  jshort   (JNICALL *CallStaticShortMethod)   (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jshort   (JNICALL *CallStaticShortMethodV)  (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  jshort   (JNICALL *CallStaticShortMethodA)  (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+  jint 	   (JNICALL *CallStaticIntMethod)     (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jint 	   (JNICALL *CallStaticIntMethodV)    (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  jint 	   (JNICALL *CallStaticIntMethodA)    (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+  jlong    (JNICALL *CallStaticLongMethod)    (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jlong    (JNICALL *CallStaticLongMethodV)   (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  jlong    (JNICALL *CallStaticLongMethodA)   (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+  jfloat   (JNICALL *CallStaticFloatMethod)   (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jfloat   (JNICALL *CallStaticFloatMethodV)  (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  jfloat   (JNICALL *CallStaticFloatMethodA)  (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+  jdouble  (JNICALL *CallStaticDoubleMethod)  (JNIEnv *, jclass, jmethodID,
+					       ...);
+  jdouble  (JNICALL *CallStaticDoubleMethodV) (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  jdouble  (JNICALL *CallStaticDoubleMethodA) (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+  void     (JNICALL *CallStaticVoidMethod)    (JNIEnv *, jclass, jmethodID,
+					       ...);
+  void     (JNICALL *CallStaticVoidMethodV)   (JNIEnv *, jclass, jmethodID,
+					       va_list);
+  void     (JNICALL *CallStaticVoidMethodA)   (JNIEnv *, jclass, jmethodID,
+					       jvalue *);
+
+  jfieldID (JNICALL *GetStaticFieldID)        (JNIEnv *, jclass, const char *,
+					       const char *);
+
+  jobject  (JNICALL *GetStaticObjectField)    (JNIEnv *, jclass, jfieldID);
+  jboolean (JNICALL *GetStaticBooleanField)   (JNIEnv *, jclass, jfieldID);
+  jbyte	   (JNICALL *GetStaticByteField)      (JNIEnv *, jclass, jfieldID);
+  jchar	   (JNICALL *GetStaticCharField)      (JNIEnv *, jclass, jfieldID);
+  jshort   (JNICALL *GetStaticShortField)     (JNIEnv *, jclass, jfieldID);
+  jint	   (JNICALL *GetStaticIntField)	      (JNIEnv *, jclass, jfieldID);
+  jlong	   (JNICALL *GetStaticLongField)      (JNIEnv *, jclass, jfieldID);
+  jfloat   (JNICALL *GetStaticFloatField)     (JNIEnv *, jclass, jfieldID);
+  jdouble  (JNICALL *GetStaticDoubleField)    (JNIEnv *, jclass, jfieldID);
+
+  void 	(JNICALL *SetStaticObjectField)	   (JNIEnv *, jclass,
+					    jfieldID, jobject);
+  void 	(JNICALL *SetStaticBooleanField)   (JNIEnv *, jclass,
+					    jfieldID, jboolean);
+  void 	(JNICALL *SetStaticByteField)	   (JNIEnv *, jclass,
+					    jfieldID, jbyte);
+  void 	(JNICALL *SetStaticCharField)	   (JNIEnv *, jclass,
+					    jfieldID, jchar);
+  void 	(JNICALL *SetStaticShortField)	   (JNIEnv *, jclass,
+					    jfieldID, jshort);
+  void 	(JNICALL *SetStaticIntField)	   (JNIEnv *, jclass,
+					    jfieldID, jint);
+  void 	(JNICALL *SetStaticLongField)	   (JNIEnv *, jclass,
+					    jfieldID, jlong);
+  void 	(JNICALL *SetStaticFloatField)	   (JNIEnv *, jclass,
+					    jfieldID, jfloat);
+  void 	(JNICALL *SetStaticDoubleField)	   (JNIEnv *, jclass,
+					    jfieldID, jdouble);
+

*** Patch too long, truncated ***




More information about the kaffe mailing list