AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-14 07:36:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gl' of ../../libBoo

Browse Source
This commit is contained in:
Jack Andersen
2015-08-18 08:02:21 -10:00
parent 3d1e6a554a 6ce2472b27
commit 3007714b5a
48 changed files with 3772 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/inputdev/HIDListenerUdev.cpp
View File

@@ -2,7 +2,11 @@
#include "inputdev/DeviceFinder.hpp"
#include <libudev.h>
#include <string.h>
<<<<<<< HEAD:lib/inputdev/HIDListenerUdev.cpp
#include <stdio.h>
=======
#include <signal.h>
>>>>>>> 6ce2472b27211a40e1d78f424f09cf26ba5e3281:src/inputdev/CHIDListenerUdev.cpp
#include <thread>
namespace boo
@@ -169,6 +173,7 @@ public:
~CHIDListenerUdev()
{
m_udevRunning = false;
pthread_kill(m_udevThread->native_handle(), SIGINT);
m_udevThread->join();
delete m_udevThread;
udev_monitor_unref(m_udevMon);