Merge tag 'upstream/2.1.8.20120507'

Upstream version 2.1.8.20120507

1 files changed, 5 insertions, 1 deletions

diff --git a/cthread.c b/cthread.c
index 4ab5e8a..86f2f9b 100644
--- a/cthread.c
+++ b/cthread.c
@@ -5,6 +5,10 @@
 #include "cusb.h"
 #include "cphidgetlist.h"
 
+#if defined(_MACOSX) && !defined(_IPHONE)
+#include "macusb.h"
+#endif
+
 CThread_func_return_t CentralThreadFunction(CThread_func_arg_t arg);
 
 static CThread CentralThread;
@@ -112,7 +116,7 @@ JoinCentralThread()
 }
 
 /*
- * registers a device to recieve events and be polled by the central
+ * registers a device to receive events and be polled by the central
  * thread This needs to start the central thread if it's not yet
  * running.
 */