* 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
+1999-09-10 Tom Tromey <tromey@cygnus.com>
+
+ * 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.
+
1999-09-09 Tom Tromey <tromey@cygnus.com>
* configure: Rebuilt.
AUTOMAKE_OPTIONS = foreign no-installinfo
if TESTSUBDIR
-SUBDIRS = testsuite
+SUBDIRS = testsuite gcj include
+else
+SUBDIRS = gcj include
endif
## ################################################################
LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
-INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) \
+INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
+ $(GCINCS) $(THREADINCS) \
$(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS)
DIVIDESPEC = @DIVIDESPEC@
-friend 'class _Jv_InterpMethod;' \
$(basename $<)
+## Headers we maintain by hand and which we want to install.
+extra_headers = java/lang/Object.h java/lang/Class.h
+
+## Install the headers. It is fairly ugly that we have to do this by
+## hand.
+install-data-local:
+ $(PRE_INSTALL)
+ @for f in $(nat_headers) $(extra_headers); do \
+ d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \
+ $(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \
+ if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f; \
+ done
## ################################################################
libgcj_basedir = @libgcj_basedir@
AUTOMAKE_OPTIONS = foreign no-installinfo
-
@TESTSUBDIR_TRUE@SUBDIRS = \
-@TESTSUBDIR_TRUE@testsuite
+@TESTSUBDIR_TRUE@testsuite gcj include
+@TESTSUBDIR_FALSE@SUBDIRS = \
+@TESTSUBDIR_FALSE@gcj include
@USE_LIBDIR_TRUE@toolexeclibdir = \
@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexeclibdir = \
LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
-INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) \
+INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
+ $(GCINCS) $(THREADINCS) \
$(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS)
$(built_java_source_files:.java=.h)
+extra_headers = java/lang/Object.h java/lang/Class.h
+
NM = nm
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
DATA = $(data_DATA) $(toolexeclib_DATA)
DIST_COMMON = COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS THANKS \
-acconfig.h acinclude.m4 aclocal.m4 configure configure.in \
-include/config.h.in include/stamp-h.in libgcj.spec.in
+acinclude.m4 aclocal.m4 configure configure.in libgcj.spec.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
-DIST_SUBDIRS = testsuite
+DIST_SUBDIRS = testsuite gcj include gcj include
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/$(srcdir)/$(CONVERT_DIR)/make-trie.P .deps/boehm.P \
.deps/defineclass.P .deps/exception.P .deps/gij.P \
$(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-
-include/config.h: include/stamp-h
- @if test ! -f $@; then \
- rm -f include/stamp-h; \
- $(MAKE) include/stamp-h; \
- else :; fi
-include/stamp-h: $(srcdir)/include/config.h.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES= CONFIG_HEADERS=include/config.h \
- $(SHELL) ./config.status
- @echo timestamp > include/stamp-h 2> /dev/null
-$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h.in
- @if test ! -f $@; then \
- rm -f $(srcdir)/include/stamp-h.in; \
- $(MAKE) $(srcdir)/include/stamp-h.in; \
- else :; fi
-$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- cd $(top_srcdir) && $(AUTOHEADER)
- @echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
- -rm -f include/config.h
-
-maintainer-clean-hdr:
libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-toolexeclibDATA
install-exec: install-exec-recursive
-install-data-am: install-dataDATA
+install-data-am: install-dataDATA install-data-local
install-data: install-data-recursive
install-am: all-am
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLTLIBRARIES \
- mostlyclean-compile mostlyclean-libtool \
- mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
- mostlyclean-tags mostlyclean-depend mostlyclean-generic
+mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \
+ mostlyclean-libtool mostlyclean-binPROGRAMS \
+ mostlyclean-noinstPROGRAMS mostlyclean-tags \
+ mostlyclean-depend mostlyclean-generic
mostlyclean: mostlyclean-recursive
-clean-am: clean-hdr clean-toolexeclibLTLIBRARIES clean-compile \
- clean-libtool clean-binPROGRAMS clean-noinstPROGRAMS \
- clean-tags clean-depend clean-generic mostlyclean-am \
- clean-local
+clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \
+ clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
+ clean-depend clean-generic mostlyclean-am clean-local
clean: clean-recursive
-distclean-am: distclean-hdr distclean-toolexeclibLTLIBRARIES \
- distclean-compile distclean-libtool \
- distclean-binPROGRAMS distclean-noinstPROGRAMS \
- distclean-tags distclean-depend distclean-generic \
- clean-am
+distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \
+ distclean-libtool distclean-binPROGRAMS \
+ distclean-noinstPROGRAMS distclean-tags \
+ distclean-depend distclean-generic clean-am
-rm -f libtool
distclean: distclean-recursive
-rm -f config.status
-maintainer-clean-am: maintainer-clean-hdr \
- maintainer-clean-toolexeclibLTLIBRARIES \
+maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-binPROGRAMS \
maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
maintainer-clean: maintainer-clean-recursive
-rm -f config.status
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \
-clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \
+.PHONY: mostlyclean-toolexeclibLTLIBRARIES \
+distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \
+maintainer-clean-toolexeclibLTLIBRARIES \
uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
mostlyclean-depend distclean-depend clean-depend \
maintainer-clean-depend info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+install-exec-am install-exec install-data-local install-data-am \
+install-data install-am install uninstall-am uninstall all-redirect \
+all-am all installdirs-am installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
$(java_source_files:.java=.class): libgcj.zip
-friend 'class _Jv_InterpMethod;' \
$(basename $<)
+install-data-local:
+ $(PRE_INSTALL)
+ @for f in $(nat_headers) $(extra_headers); do \
+ d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \
+ $(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \
+ if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f; \
+ done
+
maintainer-check: libgcj.la
$(NM) .libs/libgcj.a | grep ' T ' \
| grep -v '4java' \
#include <stdio.h>
-#include <cni.h>
-#include <java/lang/Class.h>
#include <jvm.h>
-#include <java-field.h>
+#include <gcj/cni.h>
+
+#include <java/lang/Class.h>
#include <java-interp.h>
// More nastiness: the GC wants to define TRUE and FALSE. We don't
# details.
# Usage: cd <top-srcdir> ; perl classes.pl.
-# Can also be run from the `include' directory; this lets us
+# Can also be run from the `gcj' directory; this lets us
# more easily insert the output into javaprims.h (which is where it goes).
use DirHandle;
&scan ("$dir/$_", $indent + 2);
}
- print $spaces, "};\n";
+ print $spaces, "}\n";
}
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile libgcj.spec testsuite/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile libgcj.spec testsuite/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
here=`pwd`
AC_SUBST(here)
-AC_OUTPUT(Makefile libgcj.spec testsuite/Makefile,
+AC_OUTPUT(Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile,
[if test -n "$CONFIG_FILES"; then
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
fi],
currently being ignored ("InnerClasses", "LineNumber", etc...).
*/
+#include <config.h>
+
#include <java-interp.h>
#ifdef INTERPRETER
#include <java-cpool.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/lang/Class.h>
#include <java/lang/Float.h>
#include <java/lang/Class.h>
#include <java/lang/NullPointerException.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
// eh-common.h needs gansidecl.h.
--- /dev/null
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = foreign no-installinfo
+
+gcjdir = $(includedir)/gcj
+gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
--- /dev/null
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@
+AR = @AR@
+AS = @AS@
+CC = @CC@
+COMPPATH = @COMPPATH@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+DIVIDESPEC = @DIVIDESPEC@
+DLLTOOL = @DLLTOOL@
+EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
+EXEEXT = @EXEEXT@
+GCDEPS = @GCDEPS@
+GCINCS = @GCINCS@
+GCLIBS = @GCLIBS@
+GCOBJS = @GCOBJS@
+GCSPEC = @GCSPEC@
+LD = @LD@
+LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
+LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
+LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+NM = @NM@
+PACKAGE = @PACKAGE@
+PERL = @PERL@
+RANLIB = @RANLIB@
+SYSTEMSPEC = @SYSTEMSPEC@
+THREADDEPS = @THREADDEPS@
+THREADINCS = @THREADINCS@
+THREADLIBS = @THREADLIBS@
+THREADOBJS = @THREADOBJS@
+THREADSPEC = @THREADSPEC@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
+VERSION = @VERSION@
+ZDEPS = @ZDEPS@
+ZINCS = @ZINCS@
+ZLIBS = @ZLIBS@
+ZLIBSPEC = @ZLIBSPEC@
+here = @here@
+libgcj_basedir = @libgcj_basedir@
+
+AUTOMAKE_OPTIONS = foreign no-installinfo
+
+gcjdir = $(includedir)/gcj
+gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_HEADER = ../include/config.h
+CONFIG_CLEAN_FILES =
+HEADERS = $(gcj_HEADERS)
+
+DIST_COMMON = Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign gcj/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-gcjHEADERS: $(gcj_HEADERS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(gcjdir)
+ @list='$(gcj_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gcjdir)/$$p"; \
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gcjdir)/$$p; \
+ done
+
+uninstall-gcjHEADERS:
+ @$(NORMAL_UNINSTALL)
+ list='$(gcj_HEADERS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(gcjdir)/$$p; \
+ done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = gcj
+
+distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gcj/Makefile
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-info-am:
+install-info: install-info-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-gcjHEADERS
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-gcjHEADERS
+uninstall: uninstall-am
+all-am: Makefile $(HEADERS)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(gcjdir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-tags clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-tags distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-gcjHEADERS install-gcjHEADERS tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-info-am \
+install-info install-exec-am install-exec install-data-am install-data \
+install-am install uninstall-am uninstall all-redirect all-am all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-// java-array.h - Header file for CNI arrays. -*- c++ -*-
+// array.h - Header file for CNI arrays. -*- c++ -*-
/* Copyright (C) 1998, 1999 Cygnus Solutions
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
-#ifndef __JAVA_ARRAY_H__
-#define __JAVA_ARRAY_H__
+#ifndef __GCJ_ARRAY_H__
+#define __GCJ_ARRAY_H__
#pragma interface
inline jsize JvGetArrayLength (jarray array) { return array->length; }
-#endif /* __JAVA_ARRAY_H__ */
+#endif /* __GCJ_ARRAY_H__ */
-// cni.h -*- c++ -*-
+// gcj/cni.h -*- c++ -*-
// This file describes the Cygnus Native Interface, CNI.
-// It provides a nicer interface to many of the things in javaprims.h.
+// It provides a nicer interface to many of the things in gcj/javaprims.h.
/* Copyright (C) 1998, 1999 Cygnus Solutions
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
-#ifndef __JAVA_CNI_H__
-#define __JAVA_CNI_H__
+#ifndef __GCJ_CNI_H__
+#define __GCJ_CNI_H__
#include <java/lang/Object.h>
#include <java/lang/Class.h>
-#include <java-threads.h>
-#include <java-array.h>
+#include <gcj/array.h>
extern inline jobject
JvAllocObject (jclass cls)
{
return _Jv_Free (ptr);
}
-#endif /* __JAVA_CNI_H__ */
+#endif /* __GCJ_CNI_H__ */
-// java-field.h - Header file for fieldID instances. -*- c++ -*-
+// field.h - Header file for fieldID instances. -*- c++ -*-
/* Copyright (C) 1998, 1999 Cygnus Solutions
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
-#ifndef __JAVA_FIELD_H__
-#define __JAVA_FIELD_H__
+#ifndef __GCJ_FIELD_H__
+#define __GCJ_FIELD_H__
#include <java/lang/Class.h>
#include <java/lang/reflect/Field.h>
}
-#ifdef __JAVA_CNI_H__
+#ifdef __GCJ_CNI_H__
extern inline jfieldID
JvGetFirstInstanceField (jclass klass)
{
{
return _Jv_GetObjectField (obj, field);
}
-#endif /* defined (__JAVA_CNI_H__) */
+#endif /* defined (__GCJ_CNI_H__) */
#endif
-#endif /* __JAVA_FIELD_H */
+#endif /* __GCJ_FIELD_H */
class UTFDataFormatException;
class UnsupportedEncodingException;
class Writer;
- };
+ }
namespace lang
{
class Member;
class Method;
class Modifier;
- };
- };
+ }
+ }
namespace util
{
class JarEntry;
class JarFile;
class JarInputStream;
- };
+ }
namespace zip
{
class ZipFile;
class ZipInputStream;
class ZipOutputStream;
- };
- };
- };
+ }
+ }
+ }
};
typedef struct java::lang::Object* jobject;
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
+#ifndef __GCJ_METHOD_H__
+#define __GCJ_METHOD_H__
+
extern inline jmethodID
_Jv_FromReflectedMethod(java::lang::reflect::Method *method)
{
return (jmethodID)
((char *) method->declaringClass->methods + method->offset);
}
+
+#endif /* __GCJ_METHOD_H__ */
/* Author: Kresten Krab Thorup <krab@gnu.org> */
#include <jvm.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <stdio.h>
#include <java/lang/System.h>
details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <gnu/gcj/convert/Input_EUCJIS.h>
#define ERROR_CHAR 0xFFFD
details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <gnu/gcj/convert/Input_SJIS.h>
#define ERROR_CHAR 0xFFFD
details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <gnu/gcj/convert/Output_EUCJIS.h>
/* A trie structure to map unicode values to JIS codes.
details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <gnu/gcj/convert/Output_SJIS.h>
extern unsigned short Unicode_to_JIS[];
--- /dev/null
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = foreign no-installinfo
+
+## FIXME: for now we don't install jni.h because we aren't really sure
+## where to install it.
+## include_HEADERS = jni.h
--- /dev/null
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@
+AR = @AR@
+AS = @AS@
+CC = @CC@
+COMPPATH = @COMPPATH@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+DIVIDESPEC = @DIVIDESPEC@
+DLLTOOL = @DLLTOOL@
+EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
+EXEEXT = @EXEEXT@
+GCDEPS = @GCDEPS@
+GCINCS = @GCINCS@
+GCLIBS = @GCLIBS@
+GCOBJS = @GCOBJS@
+GCSPEC = @GCSPEC@
+LD = @LD@
+LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
+LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
+LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+NM = @NM@
+PACKAGE = @PACKAGE@
+PERL = @PERL@
+RANLIB = @RANLIB@
+SYSTEMSPEC = @SYSTEMSPEC@
+THREADDEPS = @THREADDEPS@
+THREADINCS = @THREADINCS@
+THREADLIBS = @THREADLIBS@
+THREADOBJS = @THREADOBJS@
+THREADSPEC = @THREADSPEC@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
+VERSION = @VERSION@
+ZDEPS = @ZDEPS@
+ZINCS = @ZINCS@
+ZLIBS = @ZLIBS@
+ZLIBSPEC = @ZLIBSPEC@
+here = @here@
+libgcj_basedir = @libgcj_basedir@
+
+AUTOMAKE_OPTIONS = foreign no-installinfo
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+config.h: stamp-h
+ @if test ! -f $@; then \
+ rm -f stamp-h; \
+ $(MAKE) stamp-h; \
+ else :; fi
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES= CONFIG_HEADERS=include/config.h \
+ $(SHELL) ./config.status
+ @echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
+ @if test ! -f $@; then \
+ rm -f $(srcdir)/stamp-h.in; \
+ $(MAKE) $(srcdir)/stamp-h.in; \
+ else :; fi
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+ -rm -f config.h
+
+maintainer-clean-hdr:
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = include
+
+distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign include/Makefile
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-info-am:
+install-info: install-info-am
+all-recursive-am: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile config.h
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-hdr mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-hdr clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-hdr distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-hdr maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+tags distdir info-am info dvi-am dvi check check-am installcheck-am \
+installcheck install-info-am install-info all-recursive-am \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
#ifndef __JAVA_CPOOL_H__
#define __JAVA_CPOOL_H__
-#include <javaprims.h>
+#include <gcj/javaprims.h>
// we rename these, to avoid polluting the name space
#define JV_CONSTANT_Undefined (0L)
#ifndef __JAVA_INTERP_H__
#define __JAVA_INTERP_H__
-#include <config.h>
-
#include <jvm.h>
#include <java-cpool.h>
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
-#ifndef __JAVA_JNI_H__
-#define __JAVA_JNI_H__
+#ifndef __GCJ_JNI_H__
+#define __GCJ_JNI_H__
#include <stdarg.h>
#define _Jv_va_list va_list
#ifdef __cplusplus
// This is wrong, because it pollutes the name-space too much!
-#include <javaprims.h>
+#include <gcj/javaprims.h>
typedef struct _Jv_JNIEnv JNIEnv;
#else
#endif
-#endif /* __JAVA_JNI_H__ */
+#endif /* __GCJ_JNI_H__ */
#ifndef __JAVA_JVM_H__
#define __JAVA_JVM_H__
+#include <gcj/javaprims.h>
+
#include <java-assert.h>
-#include <java-field.h>
+#include <java-threads.h>
+// Must include java-gc.h before Object.h for the implementation.
+#include <java-gc.h>
+
+#include <java/lang/Object.h>
+
+// Include cni.h before field.h to enable all definitions. FIXME.
+#include <gcj/cni.h>
+#include <gcj/field.h>
/* Structure of the virtual table. */
struct _Jv_VTable
#pragma implementation "java-interp.h"
-#include <cni.h>
#include <jvm.h>
-#include <java-field.h>
#include <java-cpool.h>
#include <java-interp.h>
#include <java/lang/fdlibm.h>
/*#define ENABLE_GTK*/
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/awt/Toolkit.h>
#ifdef ENABLE_GTK
#include <java/awt/peer/GtkToolkit.h>
#endif
#include <string.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/io/File.h>
#include <java/io/IOException.h>
#include <sys/stat.h>
#include <sys/param.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/io/FileDescriptor.h>
#include <java/io/SyncFailedException.h>
#include <sys/filio.h>
#endif
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/io/FileDescriptor.h>
#include <java/io/SyncFailedException.h>
#include <java/lang/String.h>
#include <java/net/URL.h>
-// We declare these here to avoid including cni.h.
+// We declare these here to avoid including gcj/cni.h.
extern "C" void _Jv_InitClass (jclass klass);
extern "C" void _Jv_RegisterClasses (jclass *classes);
#pragma interface
-#include <javaprims.h>
-#include <java-assert.h>
-#include <java-threads.h>
-#include <java-gc.h>
+#include <gcj/javaprims.h>
// This class is mainly here as a kludge to get G++ to allocate
// vtable pointer as the *first* word of each Object, instead of
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Character.h>
#pragma implementation "Class.h"
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Class.h>
#include <java/lang/ClassLoader.h>
#include <stdlib.h>
#include <string.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
+
+#include <java-threads.h>
+#include <java-interp.h>
+
#include <java/lang/Character.h>
#include <java/lang/Thread.h>
#include <java/lang/ClassLoader.h>
#include <java/lang/IncompatibleClassChangeError.h>
#include <java/lang/reflect/Modifier.h>
-#include <java-interp.h>
-
#define CloneableClass _CL_Q34java4lang9Cloneable
extern java::lang::Class CloneableClass;
#define ObjectClass _CL_Q34java4lang6Object
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/lang/String.h>
#include <java/lang/Double.h>
#include <java/lang/NumberFormatException.h>
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/ConcreteProcess.h>
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/FirstThread.h>
#include <java/lang/Integer.h>
#include <java/lang/Long.h>
#include <java/lang/Math.h>
-#include <java-array.h>
+#include <gcj/array.h>
#include "fdlibm.h"
#pragma implementation "Object.h"
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Object.h>
#include <java-threads.h>
#include <stdlib.h>
#include <stdio.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/ConcreteProcess.h>
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Runtime.h>
#include <java/lang/UnknownError.h>
#include <string.h>
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/lang/Character.h>
#include <java/lang/String.h>
#include <java/lang/IndexOutOfBoundsException.h>
#include <sys/utsname.h>
#endif
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/System.h>
#include <java/lang/Class.h>
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
+#include <java-threads.h>
+
#include <java/lang/Thread.h>
#include <java/lang/ThreadGroup.h>
#include <java/lang/IllegalArgumentException.h>
#include <stdlib.h>
#include <jvm.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/lang/reflect/Array.h>
#include <java/lang/IllegalArgumentException.h>
#include <java/lang/Byte.h>
#include <stdlib.h>
-#include <cni.h>
#include <jvm.h>
#include <java/lang/reflect/Field.h>
#include <java/lang/reflect/Modifier.h>
#include <java/lang/Double.h>
#include <java/lang/Boolean.h>
#include <java/lang/Character.h>
-#include <java-field.h>
jint
java::lang::reflect::Field::getModifiers ()
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
-#include <java-array.h>
#include <java/lang/reflect/Method.h>
#include <java/lang/reflect/InvocationTargetException.h>
#include <java/lang/IllegalArgumentException.h>
#include <java/lang/NullPointerException.h>
#include <java/lang/Class.h>
-#include <java-method.h>
+#include <gcj/method.h>
#define ClassClass _CL_Q34java4lang5Class
extern java::lang::Class ClassClass;
#include <netdb.h>
#endif
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/net/InetAddress.h>
#include <java/net/UnknownHostException.h>
#include <bstring.h>
#endif
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/io/IOException.h>
#include <java/io/FileDescriptor.h>
#include <java/io/InterruptedIOException.h>
#include <bstring.h>
#endif
-#include <cni.h>
-#include <javaprims.h>
+#include <gcj/cni.h>
+#include <gcj/javaprims.h>
#include <java/io/IOException.h>
#include <java/io/FileDescriptor.h>
#include <java/io/InterruptedIOException.h>
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/text/Collator.h>
#define _POSIX_PTHREAD_SEMANTICS
#endif
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/util/Date.h>
#include <java/lang/String.h>
#include <string.h>
#endif
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/util/TimeZone.h>
#include <java/util/GregorianCalendar.h>
#include <time.h>
#include <zlib.h>
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/util/zip/Deflater.h>
#include <zlib.h>
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/util/zip/Inflater.h>
#include <stddef.h>
#include <jni.h>
-#include <java-field.h>
+#include <gcj/field.h>
static jclass
_Jv_JNI_GetSuperclass (JNIEnv *, jclass clazz)
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Thread.h>
#include <stdio.h>
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
// Total amount of memory allocated.
#include <signal.h>
#include <errno.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Thread.h>
#include <java/lang/System.h>
#include <stdio.h>
#include <string.h>
-#pragma implementation "java-array.h"
+#pragma implementation "gcj/array.h"
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java-signal.h>
+#include <java-threads.h>
#include <java/lang/Class.h>
#include <java/lang/Runtime.h>
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Thread.h>
/* Author: Kresten Krab Thorup <krab@gnu.org> */
+#include <config.h>
+
#include <java-interp.h>
-#include <cni.h>
#include <jvm.h>
+#include <gcj/cni.h>
#include <string.h>
#include <java-cpool.h>
#include <java/lang/Class.h>
projects / platform / upstream / gcc.git / commitdiff