X-Git-Url: https://git.smho.de/?a=blobdiff_plain;f=src%2FowInterface.h;h=0370d032887b48b4a9d6fe00959ba4b4e6faba2d;hb=1a6465a924428af072a8eb5e75ee547c394f4d8e;hp=83ab326cc373a0c74ec0972e2a48cea38f5cd17c;hpb=c7561c5e50f1df4015c0c250bdbaa2efbb95a3bd;p=owTools.git

diff --git a/src/owInterface.h b/src/owInterface.h
index 83ab326..0370d03 100755
--- a/src/owInterface.h
+++ b/src/owInterface.h
@@ -34,12 +34,28 @@
 #ifndef __OWINTERFACES_H_
 #define __OWINTERFACES_H_
 
+#if defined(WIN) || defined(LINUX)
+#else
+#if defined(_WINDOWS) || defined(__WINDOWS__) || defined(_WIN32) || defined(WIN32)
+#define WIN
+#else
+#define LINUX
+#endif
+#endif
+
+
 #include <vector>
 #include <stdint.h>
 #include <string>
+#ifdef LINUX
 #include <termios.h>
+#endif
 #include <stdarg.h>
 
+#ifdef WIN
+#include <Windows.h>
+
+#endif
 
 class owDevice;
 class owDeviceConfig;
@@ -48,7 +64,7 @@ class owDeviceConfig;
 #if defined(_WINDOWS) || defined(__WINDOWS__) || defined(_WIN32) || defined(WIN32)
    #define USE_WINDOWS_TIME 1
    #include <windows.h>
-   #include "win32/usb.h" // libusb header
+   //#include "win32/usb.h" // libusb header
 #else
    #define USE_WINDOWS_TIME 0
    #include <time.h>
@@ -84,7 +100,12 @@ public:
 		va_list arg;
 		int done;
 		va_start (arg, format);
+#ifdef LINUX
 		done = vsprintf (s, format, arg);
+#endif
+#ifdef WIN
+		done = vsprintf_s(s,300, format, arg);
+#endif
 		va_end (arg);
 		logtext=s;
 		level=llevel;
@@ -194,13 +215,13 @@ public:
 	int flashHEXFile(std::string filename,snum_t dev,int resetid,int progress);
 	
 	
-	int owFirst() {
+	virtual int owFirst() {
 		LastDiscrepancy = 0;
 		LastDeviceFlag = FALSE;
 		LastFamilyDiscrepancy = 0;
 		return owSearch();		
 	}
-	int owNext()  {
+	virtual int owNext()  {
 		return owSearch();
 	}
 	virtual ~owInterface()  {