From 51e16725b8eadd9d3f792321a7fa4a490fce8e6a Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 8 Apr 2011 16:16:38 +0200 Subject: configure.ac (libgcj_ld_export_all): Set for windows native targets to export-all-symbols. 2011-04-08 Kai Tietz * configure.ac (libgcj_ld_export_all): Set for windows native targets to export-all-symbols. (LIBGCJ_LD_EXPORT_ALL): Export libgcj_ld_export_all. * Makefile.am (libgcj_la_LDFLAGS): Add LIBGCJ_LD_EXPORT_ALL. * sysdep/i386/backtrace.h (MAIN_FUNC): Define for windows native targets to DllMain. * gcj/javaprims.h (JNICALL): Define it dependent for different windows targets. * include/jni_md.h: Likewise. * headers.txt (_Jv_JNI_ToReflectedField): Mark JNICALLS for friends. (_Jv_JNI_ToReflectedMethod): Likewise. * java/lang/Class.h: Regenerated. * java/lang/reflect/Field.h: Regenerated. * java/lang/reflect/Constructor.h: Regenerated. * java/lang/reflect/Method.h: Regenerated. * configure: Regenerated. * Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. From-SVN: r172186 --- libjava/sysdep/i386/backtrace.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libjava/sysdep') diff --git a/libjava/sysdep/i386/backtrace.h b/libjava/sysdep/i386/backtrace.h index ee793b2..1bad2e1 100644 --- a/libjava/sysdep/i386/backtrace.h +++ b/libjava/sysdep/i386/backtrace.h @@ -17,7 +17,10 @@ details. */ /* To allow this to link as a DLL. */ #define MAIN_FUNC dll_crt0__FP11per_process extern "C" int MAIN_FUNC () __declspec(dllimport); -#else /* !__CYGWIN__ */ +#elif defined (_WIN32) +#define MAIN_FUNC DllMain +extern "C" int __stdcall MAIN_FUNC (void *, unsigned long, void *); +#else /* !__CYGWIN__ && !_WIN32 */ #define MAIN_FUNC main extern int MAIN_FUNC (int, char **); #endif /* ?__CYGWIN__ */ -- cgit v1.1