Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Node 0.6.x changes, default to MacOS

  • Loading branch information...
commit da2d6d0c3ef06a0889ac809ef0da505e937350ed 1 parent 0d3a978
Hans Hübner authored January 02, 2012

Showing 2 changed files with 5 additions and 7 deletions. Show diff stats Hide diff stats

  1. 6  src/HID.cc
  2. 6  src/wscript
6  src/HID.cc
@@ -76,7 +76,7 @@ class HID
76 76
   static Handle<Value> close(const Arguments& args);
77 77
   static Handle<Value> getFeatureReport(const Arguments& args);
78 78
 
79  
-  static int EIO_recv(eio_req* req);
  79
+  static void EIO_recv(eio_req* req);
80 80
   static int EIO_recvDone(eio_req* req);
81 81
 
82 82
   struct ReceiveIOCB {
@@ -151,7 +151,7 @@ HID::write(const databuf_t& message)
151 151
   }
152 152
 }
153 153
 
154  
-int
  154
+void
155 155
 HID::EIO_recv(eio_req* req)
156 156
 {
157 157
   ReceiveIOCB* iocb = static_cast<ReceiveIOCB*>(req->data);
@@ -164,8 +164,6 @@ HID::EIO_recv(eio_req* req)
164 164
   } else {
165 165
     iocb->_data = vector<unsigned char>(buf, buf + len);
166 166
   }
167  
-
168  
-  return 0;
169 167
 }
170 168
 
171 169
 void
6  src/wscript
@@ -15,8 +15,8 @@ def configure(conf):
15 15
   conf.check_tool("compiler_cxx")
16 16
   conf.check_tool("node_addon")
17 17
   conf.check_tool("compiler_cc")
18  
-#  conf.env.append_value('LINKFLAGS', ['default/libhidapi.a', '-framework', 'IOKit', '-framework', 'CoreFoundation'])
19  
-  conf.env.append_value('LINKFLAGS', ['default/libhidapi.a', '-lusb-1.0' ])
  18
+  conf.env.append_value('LINKFLAGS', ['Release/libhidapi.a', '-framework', 'IOKit', '-framework', 'CoreFoundation'])
  19
+#  conf.env.append_value('LINKFLAGS', ['Release/libhidapi.a', '-lusb-1.0' ])
20 20
   
21 21
 def build(bld):
22 22
     bld.add_group("hidapi")
@@ -24,7 +24,7 @@ def build(bld):
24 24
     hidapi.includes = includes
25 25
     hidapi.cflags = cflags
26 26
     hidapi.source = "../hidapi/mac/hid.c"
27  
-    hidapi.source = "../hidapi/linux/hid-libusb.c"
  27
+#    hidapi.source = "../hidapi/linux/hid-libusb.c"
28 28
     hidapi.target = "hidapi"
29 29
 
30 30
     bld.add_group("adapter")

0 notes on commit da2d6d0

Please sign in to comment.
Something went wrong with that request. Please try again.