aboutsummaryrefslogtreecommitdiffstats
path: root/cthread.c
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-05-09 00:47:30 +0100
committerJonathan McCrohan <jmccrohan@gmail.com>2012-05-09 00:47:30 +0100
commit3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4 (patch)
treeafd9aac45d87ca26cd83e5b176069195250a3d7f /cthread.c
parentd070ed533fe8afdc672c6f04875f2c73f478c196 (diff)
parent260123716172d33f44bdc0e4e5422554d139215c (diff)
downloadlibphidget21-3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4.tar.gz
Merge tag 'upstream/2.1.8.20120507'
Upstream version 2.1.8.20120507
Diffstat (limited to 'cthread.c')
-rw-r--r--cthread.c6
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.
*/