diff options
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index a4c7f4f90..1165e5080 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sunjavaplugin.cxx,v $ - * $Revision: 1.26 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -178,7 +175,7 @@ rtl::OUString getRuntimeLib(const rtl::ByteSequence & data) jmp_buf jmp_jvm_abort; sig_atomic_t g_bInGetJavaVM = 0; -void abort_handler() +extern "C" void JNICALL abort_handler() { // If we are within JNI_CreateJavaVM then we jump back into getJavaVM if( g_bInGetJavaVM != 0 ) @@ -511,20 +508,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( return JFW_PLUGIN_E_VM_CREATION_FAILED; } - // The office sets a signal handler at startup. That causes a crash - // with java 1.3 under Solaris. To make it work, we set back the - // handler -#ifdef UNX - struct sigaction act; - act.sa_handler=SIG_DFL; - act.sa_flags= 0; - sigaction( SIGSEGV, &act, NULL); - sigaction( SIGPIPE, &act, NULL); - sigaction( SIGBUS, &act, NULL); - sigaction( SIGILL, &act, NULL); - sigaction( SIGFPE, &act, NULL); -#endif - // Some testing with Java 1.4 showed that JavaVMOption.optionString has to // be encoded with the system encoding (i.e., osl_getThreadTextEncoding): JavaVMInitArgs vm_args; |