repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: reset m_bStop to false in CreateThread()
[deb_libcec.git]
/
src
/
lib
/
AdapterDetection.cpp
diff --git
a/src/lib/AdapterDetection.cpp
b/src/lib/AdapterDetection.cpp
index de1da7c1f3fb2c435d1fbc6f255ec0a9b86eb192..1f96348f12fa7f175a922ce00af0e6f9e5b354b9 100644
(file)
--- a/
src/lib/AdapterDetection.cpp
+++ b/
src/lib/AdapterDetection.cpp
@@
-31,8
+31,7
@@
*/
#include "AdapterDetection.h"
*/
#include "AdapterDetection.h"
-#include "platform/os-dependent.h"
-#include "util/StdString.h"
+#include "platform/os.h"
#if defined(__APPLE__)
#include <dirent.h>
#if defined(__APPLE__)
#include <dirent.h>
@@
-44,6
+43,8
@@
#include <IOKit/serial/IOSerialKeys.h>
#include <CoreFoundation/CoreFoundation.h>
#elif defined(__WINDOWS__)
#include <IOKit/serial/IOSerialKeys.h>
#include <CoreFoundation/CoreFoundation.h>
#elif defined(__WINDOWS__)
+#pragma comment(lib, "advapi32.lib")
+#pragma comment(lib, "setupapi.lib")
#include <setupapi.h>
// the virtual COM port only shows up when requesting devices with the raw device guid!
#include <setupapi.h>
// the virtual COM port only shows up when requesting devices with the raw device guid!
@@
-324,5
+325,7
@@
uint8_t CAdapterDetection::FindAdapters(cec_adapter *deviceList, uint8_t iBufSiz
}
#endif
}
#endif
+ iBufSize = 0; /* silence "unused" warning on linux/osx */
+
return iFound;
}
return iFound;
}