Drivers: Fixed introduced Windows issues in gMobilab driver

contrib/plugins/server-drivers/gtec-gmobilabplus/src/ovasCConfigurationGTecGMobiLabPlus.h

@@ -10,12 +10,10 @@
 
 #if defined TARGET_HAS_ThirdPartyGMobiLabPlusAPI
 
-#ifndef GMOBILABPLUS_API
-#ifdef TARGET_OS_Windows
-#include <Windows.h>
-#endif
-#include <gMOBIlabplus.h>
-#endif
+// #ifdef TARGET_OS_Windows
+// 	#include <Windows.h>
+// #endif
+
 
 #include <gtk/gtk.h>
 

contrib/plugins/server-drivers/gtec-gmobilabplus/src/ovasCDriverGTecGMobiLabPlus.cpp

@@ -382,12 +382,12 @@ boolean CDriverGTecGMobiLabPlus::loop(void)
 	for(i=0 ; i<m_ui32SampleCountPerSentBlock ; i++)
 	{
 #if defined(TARGET_OS_Windows)
-		if (!m_pGtec->m_fGetData(m_pGtec->m_oDevice, &m_pGtec->m_oBuffer, &m_oOverlap))// receive samples from hardware (one per channel)
+		if (!m_pGtec->m_fGetData(m_pGtec->m_oDevice, &m_pGtec->m_oBuffer, &m_pGtec->m_oOverlap))// receive samples from hardware (one per channel)
 		{
 			m_rDriverContext.getLogManager() << LogLevel_Error << "GT_GetData failed\n";
 			return false;
 		}
-		if (WaitForSingleObject(m_oOverlap.hEvent, 1000) == WAIT_TIMEOUT)
+		if (WaitForSingleObject(m_pGtec->m_oOverlap.hEvent, 1000) == WAIT_TIMEOUT)
 		{
 			m_rDriverContext.getLogManager() << LogLevel_Warning << "Timeout in reading from the device\n";
 			return false;

contrib/plugins/server-drivers/gtec-gmobilabplus/src/ovasCDriverGTecGMobiLabPlus.h

@@ -80,12 +80,10 @@ namespace OpenViBEAcquisitionServer
 		HINSTANCE m_pLibrary;
 #elif defined(TARGET_OS_Linux)
 		void* m_pLibrary;
-
+#endif
 	private:
 
 		void allowAnalogInputs(OpenViBE::uint32 ui32ChannelIndex);
-
-#endif
 	};
 };