update to work with node v0.10.x

joeferner · joeferner · commit 32f1eea7e9dd · 2013-03-21T16:07:21.000-04:00
diff --git a/src/java.cpp b/src/java.cpp
@@ -9,6 +9,7 @@
 #include "javaScope.h"
 #include "methodCallBaton.h"
 #include "node_NodeDynamicProxyClass.h"
+#include <node_version.h>
 #include <sstream>
 
 std::string nativeBindingLocation;
@@ -650,7 +651,11 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
 void EIO_CallJs(uv_work_t* req) {
 }
 
+#if NODE_MINOR_VERSION >= 10
+void EIO_AfterCallJs(uv_work_t* req, int status) {
+#else
 void EIO_AfterCallJs(uv_work_t* req) {
+#endif
   DynamicProxyData* dynamicProxyData = static_cast<DynamicProxyData*>(req->data);
   if(!dynamicProxyDataVerify(dynamicProxyData)) {
     return;
@@ -726,7 +731,11 @@ JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jo
   uv_work_t* req = new uv_work_t();
   req->data = dynamicProxyData;
   if(myThreadId == v8ThreadId) {
+#if NODE_MINOR_VERSION >= 10
+    EIO_AfterCallJs(req, 0);
+#else
     EIO_AfterCallJs(req);
+#endif
   } else {
     uv_queue_work(uv_default_loop(), req, EIO_CallJs, EIO_AfterCallJs);
 
diff --git a/src/methodCallBaton.cpp b/src/methodCallBaton.cpp
@@ -50,7 +50,11 @@ v8::Handle<v8::Value> MethodCallBaton::runSync() {
   javaDetachCurrentThread(self->m_java->getJvm());
 }
 
+#if NODE_MINOR_VERSION >= 10
+/*static*/ void MethodCallBaton::EIO_AfterMethodCall(uv_work_t* req, int status) {
+#else
 /*static*/ void MethodCallBaton::EIO_AfterMethodCall(uv_work_t* req) {
+#endif
   MethodCallBaton* self = static_cast<MethodCallBaton*>(req->data);
   JNIEnv *env = self->m_java->getJavaEnv();
   self->after(env);
diff --git a/src/methodCallBaton.h b/src/methodCallBaton.h
@@ -5,6 +5,7 @@
 #include "utils.h"
 #include <v8.h>
 #include <node.h>
+#include <node_version.h>
 #include <jni.h>
 #include <list>
 
@@ -17,7 +18,11 @@ class MethodCallBaton {
   virtual ~MethodCallBaton();
 
   static void EIO_MethodCall(uv_work_t* req);
+#if NODE_MINOR_VERSION >= 10
+  static void EIO_AfterMethodCall(uv_work_t* req, int status);
+#else
   static void EIO_AfterMethodCall(uv_work_t* req);
+#endif
   void run();
   v8::Handle<v8::Value> runSync();
 
