[vmkit-commits] [vmkit] r63316 - /vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Jan 29 11:17:37 2009
New Revision: 63316

URL: http://llvm.org/viewvc/llvm-project?rev=63316&view=rev
Log:
Create a type for jmp_buf.

Modified:
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp?rev=63316&r1=63315&r2=63316&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp Thu Jan 29 11:17:37 2009
@@ -68,6 +68,12 @@
   
 }
 
+#if defined(__MACH__)
+typedef int* jumpbuf_t;
+#else
+typedef __jmp_buf_tag* jumpbuf_t;
+#endif
+
 typedef int (*onLoad_t)(const void**, void*);
 extern "C" void  jniProceedPendingException();
 
@@ -83,7 +89,7 @@
     th->sjlj_buffers.push_back((jmp_buf*)buf);
 
     th->startNative(1);
-    if (setjmp((__jmp_buf_tag*)buf) == 0) {
+    if (setjmp((jumpbuf_t)buf) == 0) {
       onLoad(&vm->javavmEnv, res);
     }
     jniProceedPendingException();