diff --git a/libinterp/octave-value/ov-java.cc b/libinterp/octave-value/ov-java.cc --- a/libinterp/octave-value/ov-java.cc +++ b/libinterp/octave-value/ov-java.cc @@ -608,8 +608,6 @@ initialize_jvm (void) jsize nVMs = 0; -#if ! defined (__APPLE__) && ! defined (__MACH__) - octave_shlib lib (jvm_lib_path); if (! lib) @@ -637,17 +635,6 @@ initialize_jvm (void) error ("unable to find JNI_GetCreatedJavaVMs in %s", jvm_lib_path.c_str ()); if (get_vm (&jvm, 1, &nVMs) == 0 && nVMs > 0) - -#else - - // FIXME: There exists a problem on the Mac platform that - // octave_shlib lib (jvm_lib_path) - // doesn't work with 'not-bundled' *.oct files. - - if (JNI_GetCreatedJavaVMs (&jvm, 1, &nVMs) == 0 && nVMs > 0) - -#endif - { // At least one JVM exists, try to attach to it @@ -689,24 +676,12 @@ initialize_jvm (void) vm_args.read_java_opts (initial_java_dir () + file_ops::dir_sep_str () + "java.opts"); -#if ! defined (__APPLE__) && ! defined (__MACH__) - if (create_vm (&jvm, ¤t_env, vm_args.to_args ()) != JNI_OK) error ("unable to start Java VM in %s", jvm_lib_path.c_str ()); } jvm_lib = lib; -#else - - if (JNI_CreateJavaVM (&jvm, reinterpret_cast (¤t_env), - vm_args.to_args ()) != JNI_OK) - error ("unable to start Java VM in %s", jvm_lib_path.c_str ()); - - } - -#endif - setlocale (LC_ALL, locale.c_str ()); }