[kaffe] CVS kaffe (dalibor): Fixed JNICALL declaration and added sgidefs.h to checked headers
Kaffe CVS
cvs-commits at kaffe.org
Wed Jul 7 13:19:59 PDT 2004
PatchSet 4905
Date: 2004/07/07 19:34:11
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed JNICALL declaration and added sgidefs.h to checked headers
2004-07-07 Dalibor Topic <robilad at kaffe.org>
* configure.ac:
Removed code to generate JNICALL and friends.
* config/mips/jit.h,
config/mips/sysdepCallMethod.h,
config/mips/threads.h:
Include sgidefs.h.
* include/jni.h:
Merged in code to set JNICALL and friends properly on
Windows from gcj.
* Makefile.in,
configure,
config/Makefile.in,
config/config.h.in,
kaffe/Makefile.in,
kaffe/jvmpi/Makefile.in,
kaffe/kaffe/Makefile.in,
kaffe/kaffeh/Makefile.in,
kaffe/kaffevm/gcj/Makefile.in,
kaffe/kaffevm/intrp/Makefile.in,
kaffe/kaffevm/jit/Makefile.in,
kaffe/kaffevm/jit3/Makefile.in,
kaffe/kaffevm/systems/Makefile.in,
kaffe/kaffevm/systems/beos-native/Makefile.in,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
kaffe/kaffevm/verifier/Makefile.in,
kaffe/man/Makefile.in,
kaffe/scripts/Makefile.in,
kaffe/scripts/bat/Makefile.in,
kaffe/scripts/compat/Makefile.in,
kaffe/xprof/Makefile.in,
libraries/Makefile.in,
libraries/clib/Makefile.in,
libraries/clib/awt/Makefile.in,
libraries/clib/awt/X/Makefile.in,
libraries/clib/awt/qt/Makefile.in,
libraries/clib/io/Makefile.in,
libraries/clib/libxmlj/Makefile.in,
libraries/clib/management/Makefile.in,
libraries/clib/math/Makefile.in,
libraries/clib/native/Makefile.in,
libraries/clib/net/Makefile.in,
libraries/clib/nio/Makefile.in,
libraries/clib/security/Makefile.in,
libraries/clib/sound/Makefile.in,
libraries/clib/sound/alsa/Makefile.in,
libraries/clib/sound/common/Makefile.in,
libraries/clib/sound/esd/Makefile.in,
libraries/clib/zip/Makefile.in,
libraries/extensions/Makefile.in,
libraries/extensions/comm/Makefile.in,
libraries/extensions/comm/javalib/Makefile.in,
libraries/extensions/microsoft/Makefile.in,
libraries/extensions/microsoft/clib/Makefile.in,
libraries/extensions/microsoft/javalib/Makefile.in,
libraries/extensions/pjava/Makefile.in,
libraries/extensions/pjava/javalib/Makefile.in,
libraries/extensions/servlet/Makefile.in,
libraries/extensions/servlet/javalib/Makefile.in,
libraries/javalib/Makefile.in,
replace/Makefile.in,
test/Makefile.in,
test/internal/Makefile.in,
test/regression/Makefile.in,
test/regression/compile_time/Makefile.in,
test/regression/compiler/Makefile.in,
test/regression/run_time/Makefile.in,
tools/Makefile.in,
tools/gjdoc/Makefile.in,
tools/gjdoc/javalib/Makefile.in:
Regenerated.
2004-07-07 Dalibor Topic <robilad at kaffe.org>
Yoshiharu Oba <ooba at gk.avkk.yamaha.co.jp>
* configure.ac:
Added check for sgidefs.h.
Members:
ChangeLog:1.2471->1.2472
Makefile.in:1.162->1.163
configure:1.346->1.347
configure.ac:1.45->1.46
config/Makefile.in:1.137->1.138
config/config.h.in:1.113->1.114
config/mips/jit.h:1.11->1.12
config/mips/sysdepCallMethod.h:1.2->1.3
config/mips/threads.h:1.6->1.7
include/jni.h:1.32->1.33
kaffe/Makefile.in:1.116->1.117
kaffe/jvmpi/Makefile.in:1.38->1.39
kaffe/kaffe/Makefile.in:1.133->1.134
kaffe/kaffeh/Makefile.in:1.115->1.116
kaffe/kaffevm/gcj/Makefile.in:1.96->1.97
kaffe/kaffevm/intrp/Makefile.in:1.104->1.105
kaffe/kaffevm/jit/Makefile.in:1.110->1.111
kaffe/kaffevm/jit3/Makefile.in:1.81->1.82
kaffe/kaffevm/systems/Makefile.in:1.104->1.105
kaffe/kaffevm/systems/beos-native/Makefile.in:1.96->1.97
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.102->1.103
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.106->1.107
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.77->1.78
kaffe/kaffevm/verifier/Makefile.in:1.7->1.8
kaffe/man/Makefile.in:1.102->1.103
kaffe/scripts/Makefile.in:1.139->1.140
kaffe/scripts/bat/Makefile.in:1.95->1.96
kaffe/scripts/compat/Makefile.in:1.120->1.121
kaffe/xprof/Makefile.in:1.70->1.71
libraries/Makefile.in:1.99->1.100
libraries/clib/Makefile.in:1.108->1.109
libraries/clib/awt/Makefile.in:1.112->1.113
libraries/clib/awt/X/Makefile.in:1.103->1.104
libraries/clib/awt/qt/Makefile.in:1.57->1.58
libraries/clib/io/Makefile.in:1.107->1.108
libraries/clib/libxmlj/Makefile.in:1.11->1.12
libraries/clib/management/Makefile.in:1.115->1.116
libraries/clib/math/Makefile.in:1.110->1.111
libraries/clib/native/Makefile.in:1.143->1.144
libraries/clib/net/Makefile.in:1.119->1.120
libraries/clib/nio/Makefile.in:1.34->1.35
libraries/clib/security/Makefile.in:1.81->1.82
libraries/clib/sound/Makefile.in:1.8->1.9
libraries/clib/sound/alsa/Makefile.in:1.8->1.9
libraries/clib/sound/common/Makefile.in:1.8->1.9
libraries/clib/sound/esd/Makefile.in:1.8->1.9
libraries/clib/zip/Makefile.in:1.112->1.113
libraries/extensions/Makefile.in:1.91->1.92
libraries/extensions/comm/Makefile.in:1.85->1.86
libraries/extensions/comm/javalib/Makefile.in:1.85->1.86
libraries/extensions/microsoft/Makefile.in:1.77->1.78
libraries/extensions/microsoft/clib/Makefile.in:1.81->1.82
libraries/extensions/microsoft/javalib/Makefile.in:1.78->1.79
libraries/extensions/pjava/Makefile.in:1.85->1.86
libraries/extensions/pjava/javalib/Makefile.in:1.85->1.86
libraries/extensions/servlet/Makefile.in:1.85->1.86
libraries/extensions/servlet/javalib/Makefile.in:1.85->1.86
libraries/javalib/Makefile.in:1.266->1.267
replace/Makefile.in:1.50->1.51
test/Makefile.in:1.105->1.106
test/internal/Makefile.in:1.64->1.65
test/regression/Makefile.in:1.174->1.175
test/regression/compile_time/Makefile.in:1.36->1.37
test/regression/compiler/Makefile.in:1.17->1.18
test/regression/run_time/Makefile.in:1.35->1.36
tools/Makefile.in:1.9->1.10
tools/gjdoc/Makefile.in:1.9->1.10
tools/gjdoc/javalib/Makefile.in:1.11->1.12
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2471 kaffe/ChangeLog:1.2472
--- kaffe/ChangeLog:1.2471 Wed Jul 7 17:12:56 2004
+++ kaffe/ChangeLog Wed Jul 7 19:34:11 2004
@@ -1,4 +1,88 @@
-2004-07-06 Dalibor Topic <robilad at kaffe.org>
+2004-07-07 Dalibor Topic <robilad at kaffe.org>
+
+ * configure.ac:
+ Removed code to generate JNICALL and friends.
+
+ * config/mips/jit.h,
+ config/mips/sysdepCallMethod.h,
+ config/mips/threads.h:
+ Include sgidefs.h.
+
+ * include/jni.h:
+ Merged in code to set JNICALL and friends properly on
+ Windows from gcj.
+
+ * Makefile.in,
+ configure,
+ config/Makefile.in,
+ config/config.h.in,
+ kaffe/Makefile.in,
+ kaffe/jvmpi/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/kaffeh/Makefile.in,
+ kaffe/kaffevm/gcj/Makefile.in,
+ kaffe/kaffevm/intrp/Makefile.in,
+ kaffe/kaffevm/jit/Makefile.in,
+ kaffe/kaffevm/jit3/Makefile.in,
+ kaffe/kaffevm/systems/Makefile.in,
+ kaffe/kaffevm/systems/beos-native/Makefile.in,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+ kaffe/kaffevm/verifier/Makefile.in,
+ kaffe/man/Makefile.in,
+ kaffe/scripts/Makefile.in,
+ kaffe/scripts/bat/Makefile.in,
+ kaffe/scripts/compat/Makefile.in,
+ kaffe/xprof/Makefile.in,
+ libraries/Makefile.in,
+ libraries/clib/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/clib/awt/X/Makefile.in,
+ libraries/clib/awt/qt/Makefile.in,
+ libraries/clib/io/Makefile.in,
+ libraries/clib/libxmlj/Makefile.in,
+ libraries/clib/management/Makefile.in,
+ libraries/clib/math/Makefile.in,
+ libraries/clib/native/Makefile.in,
+ libraries/clib/net/Makefile.in,
+ libraries/clib/nio/Makefile.in,
+ libraries/clib/security/Makefile.in,
+ libraries/clib/sound/Makefile.in,
+ libraries/clib/sound/alsa/Makefile.in,
+ libraries/clib/sound/common/Makefile.in,
+ libraries/clib/sound/esd/Makefile.in,
+ libraries/clib/zip/Makefile.in,
+ libraries/extensions/Makefile.in,
+ libraries/extensions/comm/Makefile.in,
+ libraries/extensions/comm/javalib/Makefile.in,
+ libraries/extensions/microsoft/Makefile.in,
+ libraries/extensions/microsoft/clib/Makefile.in,
+ libraries/extensions/microsoft/javalib/Makefile.in,
+ libraries/extensions/pjava/Makefile.in,
+ libraries/extensions/pjava/javalib/Makefile.in,
+ libraries/extensions/servlet/Makefile.in,
+ libraries/extensions/servlet/javalib/Makefile.in,
+ libraries/javalib/Makefile.in,
+ replace/Makefile.in,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/compiler/Makefile.in,
+ test/regression/run_time/Makefile.in,
+ tools/Makefile.in,
+ tools/gjdoc/Makefile.in,
+ tools/gjdoc/javalib/Makefile.in:
+ Regenerated.
+
+2004-07-07 Dalibor Topic <robilad at kaffe.org>
+ Yoshiharu Oba <ooba at gk.avkk.yamaha.co.jp>
+
+ * configure.ac:
+ Added check for sgidefs.h.
+
+2004-07-07 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffevm/systems/unix-pthreads/signal.c:
(nullException) Changed to use SIGNAL_ARGS in declaration.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.162 kaffe/Makefile.in:1.163
--- kaffe/Makefile.in:1.162 Sun Jul 4 17:51:30 2004
+++ kaffe/Makefile.in Wed Jul 7 19:34:13 2004
@@ -52,7 +52,7 @@
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/jtypes.h.in ABOUT-NLS AUTHORS \
+ $(top_srcdir)/include/kaffe/jni_md.h.in ABOUT-NLS AUTHORS \
ChangeLog INSTALL scripts/compile scripts/config.guess \
scripts/config.rpath scripts/config.sub scripts/depcomp \
scripts/install-sh scripts/ltmain.sh scripts/missing \
@@ -82,7 +82,7 @@
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES = project.xml project.properties
SCRIPTS = $(noinst_SCRIPTS)
SOURCES =
@@ -520,18 +520,18 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-include/kaffe/jtypes.h: include/kaffe/stamp-h2
+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/jtypes.h.in $(top_builddir)/config.status
+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/jtypes.h
+ cd $(top_builddir) && $(SHELL) ./config.status include/kaffe/jni_md.h
distclean-hdr:
- -rm -f include/kaffe/jtypes.h include/kaffe/stamp-h2
+ -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
Index: kaffe/configure
diff -u kaffe/configure:1.346 kaffe/configure:1.347
--- kaffe/configure:1.346 Tue Jul 6 16:38:18 2004
+++ kaffe/configure Wed Jul 7 19:34:13 2004
@@ -38092,6 +38092,156 @@
done
+for ac_header in sgidefs.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------ ##
+## Report this to kaffe at kaffe.org ##
+## ------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
for ac_header in sigcontext.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -54564,29 +54714,6 @@
cat >>confdefs.h <<_ACEOF
#define DEFAULT_KAFFEHOME "$jrelibdir"
-_ACEOF
-
-
-
-
-
-case $Khost_os in
-win32*)
- jnicall_define="__stdcall"
- jniexport_define="__declspec(dllexport)"
- ;;
-*)
- jnicall_define=""
- jniexport_define=""
- ;;
-esac
-
-cat >>confdefs.h <<_ACEOF
-#define JNICALL $jnicall_define
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define JNIEXPORT $jniexport_define
_ACEOF
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.45 kaffe/configure.ac:1.46
--- kaffe/configure.ac:1.45 Tue Jul 6 16:38:27 2004
+++ kaffe/configure.ac Wed Jul 7 19:34:23 2004
@@ -1016,6 +1016,7 @@
AC_CHECK_HEADERS([png.h])
AC_CHECK_HEADERS([poll.h])
AC_CHECK_HEADERS([pwd.h])
+AC_CHECK_HEADERS([sgidefs.h])
AC_CHECK_HEADERS([sigcontext.h])
AC_CHECK_HEADERS([signal.h])
AC_CHECK_HEADERS([stdlib.h])
@@ -1904,27 +1905,6 @@
dnl -------------------------------------------------------------------------
AC_DEFINE_UNQUOTED(DEFAULT_KAFFEHOME, "$jrelibdir", [Define default KAFFEHOME])
-
-dnl -------------------------------------------------------------------------
-
-dnl =========================================================================
-dnl Define JNI call.
-dnl -------------------------------------------------------------------------
-
-
-case $Khost_os in
-win32*)
- jnicall_define="__stdcall"
- jniexport_define="__declspec(dllexport)"
- ;;
-*)
- jnicall_define=""
- jniexport_define=""
- ;;
-esac
-
-AC_DEFINE_UNQUOTED(JNICALL, [$jnicall_define])
-AC_DEFINE_UNQUOTED(JNIEXPORT, [$jniexport_define])
dnl -------------------------------------------------------------------------
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.137 kaffe/config/Makefile.in:1.138
--- kaffe/config/Makefile.in:1.137 Sun Jul 4 17:51:37 2004
+++ kaffe/config/Makefile.in Wed Jul 7 19:34:24 2004
@@ -70,7 +70,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/jtypes.h
+CONFIG_HEADER = config.h $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.113 kaffe/config/config.h.in:1.114
--- kaffe/config/config.h.in:1.113 Sun Jul 4 17:51:38 2004
+++ kaffe/config/config.h.in Wed Jul 7 19:34:24 2004
@@ -434,6 +434,9 @@
/* Define to 1 if you have the `setrlimit' function. */
#undef HAVE_SETRLIMIT
+/* Define to 1 if you have the <sgidefs.h> header file. */
+#undef HAVE_SGIDEFS_H
+
/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION
Index: kaffe/config/mips/jit.h
diff -u kaffe/config/mips/jit.h:1.11 kaffe/config/mips/jit.h:1.12
--- kaffe/config/mips/jit.h:1.11 Sun Jul 4 00:53:13 2004
+++ kaffe/config/mips/jit.h Wed Jul 7 19:34:25 2004
@@ -19,6 +19,10 @@
#ifndef __mips_jit_h
#define __mips_jit_h
+#if defined(HAVE_SGIDEFS_H)
+#include <sgidefs.h>
+#endif /* defined(HAVE_SGIDEFS_H) */
+
#if defined (_MIPS_SIM) && (_MIPS_SIM != _MIPS_SIM_ABI32)
#error "Calling convention other than o32 not supported"
#endif
Index: kaffe/config/mips/sysdepCallMethod.h
diff -u kaffe/config/mips/sysdepCallMethod.h:1.2 kaffe/config/mips/sysdepCallMethod.h:1.3
--- kaffe/config/mips/sysdepCallMethod.h:1.2 Fri Jun 11 16:48:57 2004
+++ kaffe/config/mips/sysdepCallMethod.h Wed Jul 7 19:34:25 2004
@@ -20,6 +20,10 @@
#if defined(NEED_sysdepCallMethod)
+#if defined(HAVE_SGIDEFS_H)
+#include <sgidefs.h>
+#endif /* defined(HAVE_SGIDEFS_H) */
+
#include "support.h"
#if !defined (_MIPS_SIM) || (_MIPS_SIM == _MIPS_SIM_ABI32)
Index: kaffe/config/mips/threads.h
diff -u kaffe/config/mips/threads.h:1.6 kaffe/config/mips/threads.h:1.7
--- kaffe/config/mips/threads.h:1.6 Fri Jun 11 18:38:38 2004
+++ kaffe/config/mips/threads.h Wed Jul 7 19:34:25 2004
@@ -12,6 +12,10 @@
#ifndef __mips_threads_h
#define __mips_threads_h
+#if defined(HAVE_SGIDEFS_H)
+#include <sgidefs.h>
+#endif /* defined(HAVE_SGIDEFS_H) */
+
/**/
/* Thread handling */
/**/
Index: kaffe/include/jni.h
diff -u kaffe/include/jni.h:1.32 kaffe/include/jni.h:1.33
--- kaffe/include/jni.h:1.32 Wed Jul 7 07:16:08 2004
+++ kaffe/include/jni.h Wed Jul 7 19:34:25 2004
@@ -42,6 +42,22 @@
#include <stdarg.h>
+/* Linkage and calling conventions. */
+#if defined (_WIN32) || defined (__WIN32__) || defined (WIN32)
+
+#define JNIIMPORT __declspec(dllimport)
+#define JNIEXPORT __declspec(dllexport)
+
+#define JNICALL __stdcall
+
+#else /* !( _WIN32 || __WIN32__ || WIN32) */
+
+#define JNIIMPORT
+#define JNIEXPORT
+#define JNICALL
+
+#endif /* !( _WIN32 || __WIN32__ || WIN32) */
+
#ifdef __cplusplus
extern "C"
{
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.116 kaffe/kaffe/Makefile.in:1.117
--- kaffe/kaffe/Makefile.in:1.116 Sun Jul 4 17:51:41 2004
+++ kaffe/kaffe/Makefile.in Wed Jul 7 19:34:26 2004
@@ -66,7 +66,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.38 kaffe/kaffe/jvmpi/Makefile.in:1.39
--- kaffe/kaffe/jvmpi/Makefile.in:1.38 Sun Jul 4 17:51:40 2004
+++ kaffe/kaffe/jvmpi/Makefile.in Wed Jul 7 19:34:27 2004
@@ -61,7 +61,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.133 kaffe/kaffe/kaffe/Makefile.in:1.134
--- kaffe/kaffe/kaffe/Makefile.in:1.133 Sun Jul 4 17:51:41 2004
+++ kaffe/kaffe/kaffe/Makefile.in Wed Jul 7 19:34:27 2004
@@ -70,7 +70,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(jrebindir)"
jrebinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.115 kaffe/kaffe/kaffeh/Makefile.in:1.116
--- kaffe/kaffe/kaffeh/Makefile.in:1.115 Sun Jul 4 17:51:42 2004
+++ kaffe/kaffe/kaffeh/Makefile.in Wed Jul 7 19:34:28 2004
@@ -72,7 +72,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.96 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.97
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.96 Sun Jul 4 17:51:44 2004
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Wed Jul 7 19:34:28 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libgcj_la_LIBADD =
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.104 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.105
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.104 Sun Jul 4 17:51:49 2004
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Wed Jul 7 19:34:29 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libengine_la_LIBADD =
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.110 kaffe/kaffe/kaffevm/jit/Makefile.in:1.111
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.110 Sun Jul 4 17:51:44 2004
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Wed Jul 7 19:34:29 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libengine_la_LIBADD =
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.81 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.82
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.81 Sun Jul 4 17:51:50 2004
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Wed Jul 7 19:34:30 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libengine_la_LIBADD =
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.104 kaffe/kaffe/kaffevm/systems/Makefile.in:1.105
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.104 Sun Jul 4 17:51:52 2004
+++ kaffe/kaffe/kaffevm/systems/Makefile.in Wed Jul 7 19:34:31 2004
@@ -66,7 +66,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.96 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.97
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.96 Sun Jul 4 17:51:51 2004
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Wed Jul 7 19:34:32 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libkthread_la_LIBADD =
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.102 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.103
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.102 Sun Jul 4 17:51:54 2004
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in Wed Jul 7 19:34:33 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libkthread_la_LIBADD =
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.106 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.107
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.106 Sun Jul 4 17:51:55 2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in Wed Jul 7 19:34:34 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.77 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.78
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.77 Sun Jul 4 17:51:56 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in Wed Jul 7 19:34:34 2004
@@ -72,7 +72,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
Index: kaffe/kaffe/kaffevm/verifier/Makefile.in
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.in:1.7 kaffe/kaffe/kaffevm/verifier/Makefile.in:1.8
--- kaffe/kaffe/kaffevm/verifier/Makefile.in:1.7 Sun Jul 4 17:51:46 2004
+++ kaffe/kaffe/kaffevm/verifier/Makefile.in Wed Jul 7 19:34:35 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.102 kaffe/kaffe/man/Makefile.in:1.103
--- kaffe/kaffe/man/Makefile.in:1.102 Sun Jul 4 17:51:57 2004
+++ kaffe/kaffe/man/Makefile.in Wed Jul 7 19:34:36 2004
@@ -67,7 +67,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES = kaffe.1
SOURCES =
DIST_SOURCES =
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.139 kaffe/kaffe/scripts/Makefile.in:1.140
--- kaffe/kaffe/scripts/Makefile.in:1.139 Sun Jul 4 17:51:59 2004
+++ kaffe/kaffe/scripts/Makefile.in Wed Jul 7 19:34:37 2004
@@ -74,7 +74,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES = install-jar kaffe kaffexprof javac javakey jar \
javah javap jdb kjc kopi javadoc appletviewer rmic rmiregistry \
serialver native2ascii
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.95 kaffe/kaffe/scripts/bat/Makefile.in:1.96
--- kaffe/kaffe/scripts/bat/Makefile.in:1.95 Sun Jul 4 17:51:58 2004
+++ kaffe/kaffe/scripts/bat/Makefile.in Wed Jul 7 19:34:38 2004
@@ -66,7 +66,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.120 kaffe/kaffe/scripts/compat/Makefile.in:1.121
--- kaffe/kaffe/scripts/compat/Makefile.in:1.120 Sun Jul 4 17:52:00 2004
+++ kaffe/kaffe/scripts/compat/Makefile.in Wed Jul 7 19:34:38 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES = java javac appletviewer javadoc
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jrebindir)"
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
Index: kaffe/kaffe/xprof/Makefile.in
diff -u kaffe/kaffe/xprof/Makefile.in:1.70 kaffe/kaffe/xprof/Makefile.in:1.71
--- kaffe/kaffe/xprof/Makefile.in:1.70 Sun Jul 4 17:52:01 2004
+++ kaffe/kaffe/xprof/Makefile.in Wed Jul 7 19:34:39 2004
@@ -75,7 +75,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/libraries/Makefile.in
diff -u kaffe/libraries/Makefile.in:1.99 kaffe/libraries/Makefile.in:1.100
--- kaffe/libraries/Makefile.in:1.99 Sun Jul 4 17:52:15 2004
+++ kaffe/libraries/Makefile.in Wed Jul 7 19:34:40 2004
@@ -66,7 +66,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.108 kaffe/libraries/clib/Makefile.in:1.109
--- kaffe/libraries/clib/Makefile.in:1.108 Sun Jul 4 17:52:05 2004
+++ kaffe/libraries/clib/Makefile.in Wed Jul 7 19:34:40 2004
@@ -66,7 +66,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
Index: kaffe/libraries/clib/awt/Makefile.in
diff -u kaffe/libraries/clib/awt/Makefile.in:1.112 kaffe/libraries/clib/awt/Makefile.in:1.113
--- kaffe/libraries/clib/awt/Makefile.in:1.112 Sun Jul 4 17:52:03 2004
+++ kaffe/libraries/clib/awt/Makefile.in Wed Jul 7 19:34:41 2004
@@ -66,7 +66,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
Index: kaffe/libraries/clib/awt/X/Makefile.in
diff -u kaffe/libraries/clib/awt/X/Makefile.in:1.103 kaffe/libraries/clib/awt/X/Makefile.in:1.104
--- kaffe/libraries/clib/awt/X/Makefile.in:1.103 Sun Jul 4 17:52:01 2004
+++ kaffe/libraries/clib/awt/X/Makefile.in Wed Jul 7 19:34:42 2004
@@ -71,7 +71,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/libraries/clib/awt/qt/Makefile.in
diff -u kaffe/libraries/clib/awt/qt/Makefile.in:1.57 kaffe/libraries/clib/awt/qt/Makefile.in:1.58
--- kaffe/libraries/clib/awt/qt/Makefile.in:1.57 Sun Jul 4 17:52:02 2004
+++ kaffe/libraries/clib/awt/qt/Makefile.in Wed Jul 7 19:34:42 2004
@@ -72,7 +72,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/libraries/clib/io/Makefile.in
diff -u kaffe/libraries/clib/io/Makefile.in:1.107 kaffe/libraries/clib/io/Makefile.in:1.108
--- kaffe/libraries/clib/io/Makefile.in:1.107 Sun Jul 4 17:52:04 2004
+++ kaffe/libraries/clib/io/Makefile.in Wed Jul 7 19:34:43 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/libraries/clib/libxmlj/Makefile.in
diff -u kaffe/libraries/clib/libxmlj/Makefile.in:1.11 kaffe/libraries/clib/libxmlj/Makefile.in:1.12
--- kaffe/libraries/clib/libxmlj/Makefile.in:1.11 Sun Jul 4 17:52:11 2004
+++ kaffe/libraries/clib/libxmlj/Makefile.in Wed Jul 7 19:34:43 2004
@@ -83,7 +83,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/libraries/clib/management/Makefile.in
diff -u kaffe/libraries/clib/management/Makefile.in:1.115 kaffe/libraries/clib/management/Makefile.in:1.116
--- kaffe/libraries/clib/management/Makefile.in:1.115 Sun Jul 4 17:52:05 2004
+++ kaffe/libraries/clib/management/Makefile.in Wed Jul 7 19:34:44 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/libraries/clib/math/Makefile.in
diff -u kaffe/libraries/clib/math/Makefile.in:1.110 kaffe/libraries/clib/math/Makefile.in:1.111
--- kaffe/libraries/clib/math/Makefile.in:1.110 Sun Jul 4 17:52:06 2004
+++ kaffe/libraries/clib/math/Makefile.in Wed Jul 7 19:34:44 2004
@@ -69,7 +69,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
- $(top_builddir)/include/kaffe/jtypes.h
+ $(top_builddir)/include/kaffe/jni_md.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
Index: kaffe/libraries/clib/native/Makefile.in
diff -u kaffe/libraries/clib/native/Makefile.in:1.143 kaffe/libraries/clib/native/Makefile.in:1.144
--- kaffe/libraries/clib/native/Makefile.in:1.143 Sun Jul 4 17:52:07 2004
+++ kaffe/libraries/clib/native/Makefile.in Wed Jul 7 19:34:45 2004
@@ -72,7 +72,7 @@
*** Patch too long, truncated ***
More information about the kaffe
mailing list