Merge branch 'OSX_merge_cleaned'

This merge:
- fixes issues with invalid mutex
- moves tests to Python 3
- allows to compile the code natively under Visual Studio with CMake
- allows to compile under QtCreator under MS Windows
- fixes some issues with test suite
- allows to run tests under Windows
- allows to compile using QMake (and easy adding to Qt projects)
- decreases delays between sending commands thus increasing 2x
communication speed

1 files changed, 5 insertions, 2 deletions

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index 9a9d106..0d702eb 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -10,11 +10,14 @@
 #include "include/cxx_semantics.h"
 #include <functional>
 
+std::mutex nitrokey::proto::send_receive_mtx;
+
 namespace nitrokey{
 
     std::mutex mex_dev_com_manager;
 
-#ifdef __WIN32
+#ifndef strndup
+#ifdef _WIN32
 #pragma message "Using own strndup"
 char * strndup(const char* str, size_t maxlen){
   size_t len = strnlen(str, maxlen);
@@ -24,7 +27,7 @@ char * strndup(const char* str, size_t maxlen){
   return dup;
 }
 #endif
-
+#endif
 
 using nitrokey::misc::strcpyT;