load.c in rjb-1.1.9

- old
+ new

@@ -10,11 +10,11 @@
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 91 2009-09-07 14:13:17Z arton $
+ * $Id: load.c 96 2009-09-10 13:57:04Z arton $
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include "ruby.h"
@@ -268,15 +268,22 @@
         if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
         {
             JVMDLL = "%s/Libraries/libjvm.dylib";
             CREATEJVM = "JNI_CreateJavaVM_Impl";
             GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs_Impl";
-        }
 #endif
         if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
 	{
 	    return -1;
 	}
+#if defined(__APPLE__) && defined(__MACH__)
+        }
+#endif
+#if RJB_RUBY_VERSION_CODE < 190
+        ruby_errinfo = Qnil;
+#else
+        rb_set_errinfo(Qnil);
+#endif
     }
 
     if (NIL_P(getdefaultjavavminitargsfunc))
     {
 	return -1;