summaryrefslogtreecommitdiff
path: root/libusbhp/libusbhp.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2013-03-26 06:40:17 -0400
committerBent Bisballe Nyeng <deva@aasimon.org>2013-03-26 06:40:17 -0400
commit3f8cf55f143828a4ada0b2446ea6fcdcf595ed60 (patch)
tree56b5056a478525c015cc3ef8025081f7a72bb93f /libusbhp/libusbhp.cc
parent42fb6a9474cb189d62d895bbc65185d7223ca564 (diff)
Fixed compilation with autotools.
Diffstat (limited to 'libusbhp/libusbhp.cc')
-rw-r--r--libusbhp/libusbhp.cc15
1 files changed, 12 insertions, 3 deletions
diff --git a/libusbhp/libusbhp.cc b/libusbhp/libusbhp.cc
index 9e79220..4058c10 100644
--- a/libusbhp/libusbhp.cc
+++ b/libusbhp/libusbhp.cc
@@ -28,7 +28,6 @@
#ifdef __linux__
#include <poll.h>
-#include <libudev.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -53,7 +52,13 @@
#endif/*_WIN32*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifdef __linux__
+#include <libudev.h>
+
struct dev_list_t {
char *path;
unsigned short vid;
@@ -105,13 +110,13 @@ static void dev_list_add(struct libusbhp_t *h, const char *path,
static int dev_list_remove(struct libusbhp_t *h, const char *path)
{
struct dev_list_t *p = h->devlist;
- if(!p) return;
+ if(!p) return 1;
if(!strcmp(p->path, path)) {
h->devlist = p->next;
free(p->path);
free(p);
- return;
+ return 0;
}
while(p->next) {
@@ -438,3 +443,7 @@ void libusbhp_register_hotplug_listeners(struct libusbhp_t *handle,
handle->detach = disconnected_cb;
handle->user_data = user_data;
}
+
+#ifdef __cplusplus
+}
+#endif