From 194351d13dc3ee6f506bfc9d4b49244b6b318a12 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Tue, 15 Oct 2013 17:28:54 +0200 Subject: [PATCH] Add support for node v0.10.x - It fixes issue #4. --- src/cardreader.cpp | 12 ++++++++++++ src/cardreader.h | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/cardreader.cpp b/src/cardreader.cpp index c607ed0..6c24dc5 100644 --- a/src/cardreader.cpp +++ b/src/cardreader.cpp @@ -311,7 +311,11 @@ void CardReader::DoConnect(uv_work_t* req) { baton->result = cr; } +#if NODE_VERSION_AT_LEAST(0, 9, 4) +void CardReader::AfterConnect(uv_work_t* req, int status) { +#else void CardReader::AfterConnect(uv_work_t* req) { +#endif HandleScope scope; Baton* baton = static_cast(req->data); @@ -363,7 +367,11 @@ void CardReader::DoDisconnect(uv_work_t* req) { baton->result = reinterpret_cast(result); } +#if NODE_VERSION_AT_LEAST(0, 9, 4) +void CardReader::AfterDisconnect(uv_work_t* req, int status) { +#else void CardReader::AfterDisconnect(uv_work_t* req) { +#endif HandleScope scope; Baton* baton = static_cast(req->data); @@ -420,7 +428,11 @@ void CardReader::DoTransmit(uv_work_t* req) { baton->result = tr; } +#if NODE_VERSION_AT_LEAST(0, 9, 4) +void CardReader::AfterTransmit(uv_work_t* req, int status) { +#else void CardReader::AfterTransmit(uv_work_t* req) { +#endif HandleScope scope; Baton* baton = static_cast(req->data); diff --git a/src/cardreader.h b/src/cardreader.h index 28ae653..3ffcf8d 100644 --- a/src/cardreader.h +++ b/src/cardreader.h @@ -2,6 +2,7 @@ #define CARDREADER_H #include +#include #include #include #include @@ -75,13 +76,21 @@ class CardReader: public node::ObjectWrap { static void HandleReaderStatusChange(uv_async_t *handle, int status); static void* HandlerFunction(void* arg); static void DoConnect(uv_work_t* req); - static void AfterConnect(uv_work_t* req); static void DoDisconnect(uv_work_t* req); - static void AfterDisconnect(uv_work_t* req); static void DoTransmit(uv_work_t* req); - static void AfterTransmit(uv_work_t* req); static void CloseCallback(uv_handle_t *handle); +#if NODE_VERSION_AT_LEAST(0, 9, 4) + static void AfterConnect(uv_work_t* req, int status); + static void AfterDisconnect(uv_work_t* req, int status); + static void AfterTransmit(uv_work_t* req, int status); +#else + static void AfterConnect(uv_work_t* req); + static void AfterDisconnect(uv_work_t* req); + static void AfterTransmit(uv_work_t* req); +#endif + + static v8::Handle CreateBufferInstance(char* data, unsigned long size); private: